lp:~stolowski/unity-scopes-api/remote-scopes-partner-id
Created by
Paweł Stołowski
and last modified
- Get this branch:
- bzr branch lp:~stolowski/unity-scopes-api/remote-scopes-partner-id
Only
Paweł Stołowski
can upload to this branch. If you are
Paweł Stołowski
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Marcus Tomlinson (community): Approve
- Michi Henning (community): Needs Fixing
-
Diff: 236 lines (+77/-9)7 files modifiedinclude/unity/scopes/internal/smartscopes/SmartScopesClient.h (+3/-2)
src/scopes/internal/smartscopes/SmartScopesClient.cpp (+27/-2)
test/gtest/scopes/internal/smartscopes/RaiiServer.h (+2/-2)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/CMakeLists.txt (+4/-0)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py (+9/-1)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+31/-2)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/partnerid (+1/-0)
- Unity Team: Pending requested
-
Diff: 8219 lines (+2811/-992)151 files modifiedCMakeLists.txt (+9/-2)
CONFIGFILES (+11/-7)
RELEASE_NOTES.md (+5/-0)
STRUCTS (+2/-1)
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/libunity-scopes3.symbols (+22/-8)
doc/tutorial.dox (+33/-5)
include/unity/scopes/Annotation.h (+43/-29)
include/unity/scopes/CMakeLists.txt (+1/-0)
include/unity/scopes/Runtime.h (+14/-4)
include/unity/scopes/ScopeBase.h (+2/-2)
include/unity/scopes/ScopeMetadata.h (+12/-6)
include/unity/scopes/internal/ActivationQueryObject.h (+5/-2)
include/unity/scopes/internal/Logger.h (+75/-0)
include/unity/scopes/internal/MWRegistry.h (+1/-0)
include/unity/scopes/internal/MiddlewareBase.h (+1/-0)
include/unity/scopes/internal/ObjectImpl.h (+4/-1)
include/unity/scopes/internal/PreviewQueryObject.h (+4/-1)
include/unity/scopes/internal/PreviewReplyImpl.h (+3/-1)
include/unity/scopes/internal/QueryCtrlImpl.h (+4/-1)
include/unity/scopes/internal/QueryObject.h (+9/-3)
include/unity/scopes/internal/RegistryObject.h (+11/-4)
include/unity/scopes/internal/ReplyImpl.h (+3/-1)
include/unity/scopes/internal/ReplyObject.h (+1/-0)
include/unity/scopes/internal/RuntimeImpl.h (+9/-9)
include/unity/scopes/internal/ScopeConfig.h (+4/-2)
include/unity/scopes/internal/ScopeMetadataImpl.h (+6/-3)
include/unity/scopes/internal/ScopeObjectBase.h (+0/-3)
include/unity/scopes/internal/SearchReplyImpl.h (+5/-2)
include/unity/scopes/internal/SettingsDB.h (+14/-4)
include/unity/scopes/internal/TaskWrapper.h (+2/-2)
include/unity/scopes/internal/smartscopes/SSQueryObject.h (+4/-2)
include/unity/scopes/internal/smartscopes/SSScopeObject.h (+2/-1)
include/unity/scopes/internal/smartscopes/SmartScope.h (+1/-0)
include/unity/scopes/internal/smartscopes/SmartScopesClient.h (+10/-4)
include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h (+4/-1)
include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h (+4/-1)
include/unity/scopes/testing/ScopeMetadataBuilder.h (+2/-1)
include/unity/scopes/utility/BufferedResultForwarder.h (+114/-0)
include/unity/scopes/utility/CMakeLists.txt (+7/-0)
include/unity/scopes/utility/internal/BufferedResultForwarderImpl.h (+68/-0)
include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h (+92/-0)
include/unity/scopes/utility/internal/CMakeLists.txt (+3/-0)
scoperegistry/DirWatcher.cpp (+27/-14)
scoperegistry/DirWatcher.h (+5/-2)
scoperegistry/FindFiles.cpp (+10/-5)
scoperegistry/ScopesWatcher.cpp (+110/-99)
scoperegistry/ScopesWatcher.h (+5/-3)
scoperegistry/scoperegistry.cpp (+7/-6)
scoperunner/scoperunner.cpp (+3/-4)
src/scopes/CMakeLists.txt (+1/-0)
src/scopes/Runtime.cpp (+2/-2)
src/scopes/ScopeMetadata.cpp (+8/-3)
src/scopes/internal/ActivationQueryObject.cpp (+9/-8)
src/scopes/internal/AnnotationImpl.cpp (+4/-5)
src/scopes/internal/CMakeLists.txt (+1/-0)
src/scopes/internal/CannedQueryImpl.cpp (+1/-1)
src/scopes/internal/DepartmentImpl.cpp (+1/-1)
src/scopes/internal/Logger.cpp (+165/-0)
src/scopes/internal/MWRegistry.cpp (+4/-0)
src/scopes/internal/MiddlewareBase.cpp (+0/-6)
src/scopes/internal/ObjectImpl.cpp (+3/-2)
src/scopes/internal/OnlineAccountClientImpl.cpp (+16/-2)
src/scopes/internal/PreviewQueryObject.cpp (+9/-9)
src/scopes/internal/PreviewReplyImpl.cpp (+6/-4)
src/scopes/internal/PreviewReplyObject.cpp (+0/-1)
src/scopes/internal/PreviewWidgetImpl.cpp (+2/-2)
src/scopes/internal/QueryCtrlImpl.cpp (+6/-6)
src/scopes/internal/QueryObject.cpp (+14/-14)
src/scopes/internal/RegistryImpl.cpp (+3/-4)
src/scopes/internal/RegistryObject.cpp (+120/-78)
src/scopes/internal/ReplyImpl.cpp (+10/-14)
src/scopes/internal/ReplyObject.cpp (+5/-9)
src/scopes/internal/RuntimeImpl.cpp (+36/-27)
src/scopes/internal/ScopeConfig.cpp (+26/-10)
src/scopes/internal/ScopeImpl.cpp (+5/-5)
src/scopes/internal/ScopeLoader.cpp (+0/-1)
src/scopes/internal/ScopeMetadataImpl.cpp (+43/-14)
src/scopes/internal/ScopeObject.cpp (+14/-15)
src/scopes/internal/SearchReplyImpl.cpp (+8/-7)
src/scopes/internal/SettingsDB.cpp (+32/-10)
src/scopes/internal/smartscopes/HttpClientQt.cpp (+5/-1)
src/scopes/internal/smartscopes/HttpClientQtThread.cpp (+7/-1)
src/scopes/internal/smartscopes/SSQueryObject.cpp (+10/-9)
src/scopes/internal/smartscopes/SSRegistryObject.cpp (+22/-14)
src/scopes/internal/smartscopes/SSScopeObject.cpp (+8/-8)
src/scopes/internal/smartscopes/SmartScope.cpp (+55/-32)
src/scopes/internal/smartscopes/SmartScopesClient.cpp (+103/-51)
src/scopes/internal/zmq_middleware/ObjectAdapter.cpp (+17/-18)
src/scopes/internal/zmq_middleware/QueryCtrlI.cpp (+4/-3)
src/scopes/internal/zmq_middleware/QueryI.cpp (+3/-2)
src/scopes/internal/zmq_middleware/RegistryI.cpp (+6/-5)
src/scopes/internal/zmq_middleware/ReplyI.cpp (+5/-4)
src/scopes/internal/zmq_middleware/ScopeI.cpp (+7/-7)
src/scopes/internal/zmq_middleware/ServantBase.cpp (+1/-1)
src/scopes/internal/zmq_middleware/StateReceiverI.cpp (+3/-2)
src/scopes/internal/zmq_middleware/StopPublisher.cpp (+0/-1)
src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp (+37/-40)
src/scopes/internal/zmq_middleware/ZmqScope.cpp (+6/-4)
src/scopes/internal/zmq_middleware/ZmqSender.cpp (+0/-6)
src/scopes/testing/ScopeMetadataBuilder.cpp (+15/-6)
src/scopes/utility/BufferedResultForwarder.cpp (+161/-0)
src/scopes/utility/CMakeLists.txt (+7/-0)
src/scopes/utility/internal/BufferedResultForwarderImpl.cpp (+121/-0)
src/scopes/utility/internal/BufferedSearchReplyImpl.cpp (+158/-0)
src/scopes/utility/internal/CMakeLists.txt (+6/-0)
test/gtest/CMakeLists.txt (+3/-3)
test/gtest/scopes/Activation/Activation_test.cpp (+4/-4)
test/gtest/scopes/Annotation/Annotation_test.cpp (+4/-8)
test/gtest/scopes/CMakeLists.txt (+1/-0)
test/gtest/scopes/CannedQuery/CannedQuery_test.cpp (+3/-3)
test/gtest/scopes/Filters/Filters_test.cpp (+3/-3)
test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp (+4/-4)
test/gtest/scopes/Invocation/Invocation_test.cpp (+9/-9)
test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp (+0/-43)
test/gtest/scopes/Registry/Registry_test.cpp (+92/-60)
test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in (+2/-1)
test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp (+1/-1)
test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp (+6/-6)
test/gtest/scopes/Runtime/Runtime_test.cpp (+9/-9)
test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp (+2/-2)
test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp (+2/-2)
test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp (+1/-1)
test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp (+5/-5)
test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt (+6/-6)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+16/-13)
test/gtest/scopes/internal/ScopeConfig/bad_keywords.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in (+2/-1)
test/gtest/scopes/internal/ScopeConfig/empty_keywords.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeConfig/single_keyword.ini.in (+1/-1)
test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+34/-13)
test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+16/-14)
test/gtest/scopes/internal/smartscopes/RaiiServer.h (+2/-2)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/CMakeLists.txt (+4/-0)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py (+10/-2)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+34/-11)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/partnerid (+1/-0)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp (+5/-5)
test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp (+18/-6)
test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp (+5/-5)
test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp (+2/-2)
test/gtest/scopes/testing/CMakeLists.txt (+4/-4)
test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp (+6/-1)
test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp (+329/-0)
test/gtest/scopes/utility/BufferedResultForwarder/CMakeLists.txt (+4/-0)
test/gtest/scopes/utility/CMakeLists.txt (+1/-0)
tools/create_globalheader.py (+10/-11)
tools/formatcode.in (+6/-2)
unity-scopes.map (+12/-6)
valgrind-suppress (+8/-0)
Related source package recipes
Branch information
Recent revisions
- 561. By Paweł Stołowski
-
Moved default partner-id path to a static const. Use partner-id value with space to test percent-encoding.
- 557. By Paweł Stołowski
-
Extended SmartScopesClient test to check user agent string for remote-scopes call.
- 556. By Paweł Stołowski
-
Send /custom/partner-id with UserAgent header when requesting remote scopes.
- 555. By Marcus Tomlinson
-
Added support for IsAggregator scope .ini option.
Approved by PS Jenkins bot, Michi Henning.
- 554. By Michi Henning
-
Changed run_scope() to not create a separate run time up-front just so it can
push the state notification when registry when the scope finishes. This has
two advantages:- We don't create an extra eleven threads that hang around and do nothing for the
entire life time of the scope.- We don't create two run times with the same name (as was happening previously).
The run time IDs must be unique because they are used to derive other things
that must be unique, such as socket names and log file names. In particular,
the duplicate run time IDs caused the log file to get corrupted.This solution is better than what we had, but still sub-optimal because we are still creating a separate run time at the end just so we can tell the registry that the scope has stopped. It would be better to bury these notifications in the middleware, where we can take short-cuts without all the overhead of outgoing thread pools and the like.
Also deprecated the run_scope() overload that takes a Runtime.ini param. That one was not needed, and not called by anyone (including the Go implementation).
We need to remember to strip this method from Runtime next time we do an ABI incompatible release.
Stripped out a bunch of redundant "mutable" in RuntimeImpl.h.
Approved by Marcus Tomlinson, PS Jenkins bot.
- 553. By Michi Henning
-
Generated convenience header wasn't generating #pragma once. Fixes: https:/
/bugs.launchpad .net/bugs/ 1385360. Approved by PS Jenkins bot, Marcus Tomlinson.
- 552. By Marcus Tomlinson
-
* Update the accounts we already know about when refresh_
service_ statuses( ) is called. * Remove the refresh_
services_ no_main_ loop test as refresh_ service_ statuses( ) just won't work without a main loop (this test passed incorrectly before). Fixes: https:/ /bugs.launchpad .net/bugs/ 1398813. Approved by Pawel Stolowski, PS Jenkins bot.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:unity-scopes-api
