Merge lp://staging/~michihenning/unity-scopes-api/add-logging into lp://staging/unity-scopes-api/devel
Status: | Merged |
---|---|
Merge reported by: | Michi Henning |
Merged at revision: | not available |
Proposed branch: | lp://staging/~michihenning/unity-scopes-api/add-logging |
Merge into: | lp://staging/unity-scopes-api/devel |
Diff against target: |
3937 lines (+904/-493) 78 files modified
CMakeLists.txt (+1/-1) debian/control (+1/-0) debian/libunity-scopes3.symbols (+2/-1) include/unity/scopes/Annotation.h (+43/-29) include/unity/scopes/internal/ActivationQueryObject.h (+5/-2) include/unity/scopes/internal/Logger.h (+75/-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 (+7/-2) include/unity/scopes/internal/ReplyImpl.h (+3/-1) include/unity/scopes/internal/ReplyObject.h (+1/-0) include/unity/scopes/internal/RuntimeImpl.h (+3/-0) 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/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 (+5/-1) include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h (+4/-1) include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h (+3/-1) scoperegistry/DirWatcher.cpp (+8/-7) scoperegistry/DirWatcher.h (+4/-1) scoperegistry/ScopesWatcher.cpp (+34/-21) scoperegistry/ScopesWatcher.h (+3/-1) scoperegistry/scoperegistry.cpp (+5/-5) scoperunner/scoperunner.cpp (+2/-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/Logger.cpp (+165/-0) src/scopes/internal/MiddlewareBase.cpp (+0/-6) src/scopes/internal/ObjectImpl.cpp (+3/-2) src/scopes/internal/OnlineAccountClientImpl.cpp (+4/-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/QueryCtrlImpl.cpp (+6/-6) src/scopes/internal/QueryObject.cpp (+14/-14) src/scopes/internal/RegistryImpl.cpp (+3/-4) src/scopes/internal/RegistryObject.cpp (+57/-37) src/scopes/internal/ReplyImpl.cpp (+10/-14) src/scopes/internal/ReplyObject.cpp (+5/-9) src/scopes/internal/RuntimeImpl.cpp (+19/-8) src/scopes/internal/ScopeConfig.cpp (+0/-1) src/scopes/internal/ScopeImpl.cpp (+5/-5) src/scopes/internal/ScopeLoader.cpp (+0/-1) src/scopes/internal/ScopeObject.cpp (+14/-15) src/scopes/internal/SearchReplyImpl.cpp (+8/-7) src/scopes/internal/SettingsDB.cpp (+18/-9) src/scopes/internal/smartscopes/HttpClientQt.cpp (+0/-2) src/scopes/internal/smartscopes/HttpClientQtThread.cpp (+0/-1) src/scopes/internal/smartscopes/SSQueryObject.cpp (+10/-9) src/scopes/internal/smartscopes/SSRegistryObject.cpp (+21/-13) src/scopes/internal/smartscopes/SSScopeObject.cpp (+8/-8) src/scopes/internal/smartscopes/SmartScope.cpp (+55/-32) src/scopes/internal/smartscopes/SmartScopesClient.cpp (+58/-35) 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 (+30/-39) src/scopes/internal/zmq_middleware/ZmqScope.cpp (+6/-4) src/scopes/internal/zmq_middleware/ZmqSender.cpp (+0/-6) test/gtest/scopes/Annotation/Annotation_test.cpp (+4/-8) test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+16/-14) test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+6/-3) 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) |
To merge this branch: | bzr merge lp://staging/~michihenning/unity-scopes-api/add-logging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Marcus Tomlinson (community) | Approve | ||
Review via email: mp+242308@code.staging.launchpad.net |
Commit message
Stage 1 of logging. Added simple logger to the run time (scoped by the run time) and changed the places in the code where we were using cout/cerr to use the logger instead.
Still to do:
- add file logging to separate files for scopes, including the relevant config items
- add config items to control log size and rotation
- add trace for the IPC messages so we can watch them
Seeing that this diff is very large already, I'd rather stage the remaining work.
Description of the change
Stage 1 of logging. Added simple logger to the run time (scoped by the run time) and changed the places in the code where we were using cout/cerr to use the logger instead.
Still to do:
- add file logging to separate files for scopes, including the relevant config items
- add config items to control log size and rotation
- add trace for the IPC messages so we can watch them
Seeing that this diff is very large already, I'd rather stage the remaining work.
FAILED: Continuous integration, rev:526 jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- ci/1321/ jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-amd64- ci/31 jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-armhf- ci/31/console jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-i386- ci/31
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scopes- api-devel- ci/1321/ rebuild
http://