Merge lp://staging/~michihenning/unity-scopes-api/add-logging into lp://staging/unity-scopes-api
Status: | Merged |
---|---|
Approved by: | Paweł Stołowski |
Approved revision: | 572 |
Merged at revision: | 278 |
Proposed branch: | lp://staging/~michihenning/unity-scopes-api/add-logging |
Merge into: | lp://staging/unity-scopes-api |
Diff against target: |
4306 lines (+1067/-609) 101 files modified
CMakeLists.txt (+1/-7) CONFIGFILES (+44/-7) HACKING (+0/-27) debian/changelog (+6/-0) debian/libunity-scopes3.symbols (+11/-4) include/unity/scopes/internal/ActivationQueryObject.h (+1/-2) include/unity/scopes/internal/DfltConfig.h.in (+14/-6) include/unity/scopes/internal/Logger.h (+55/-9) include/unity/scopes/internal/ObjectImpl.h (+1/-4) include/unity/scopes/internal/PreviewQueryObject.h (+1/-2) include/unity/scopes/internal/PreviewReplyImpl.h (+1/-2) include/unity/scopes/internal/QueryCtrlImpl.h (+1/-3) include/unity/scopes/internal/QueryCtrlObjectBase.h (+2/-1) include/unity/scopes/internal/QueryObject.h (+2/-6) include/unity/scopes/internal/QueryObjectBase.h (+2/-1) include/unity/scopes/internal/RegistryImpl.h (+1/-1) include/unity/scopes/internal/ReplyImpl.h (+1/-3) include/unity/scopes/internal/ReplyObject.h (+1/-0) include/unity/scopes/internal/RuntimeConfig.h (+10/-0) include/unity/scopes/internal/RuntimeImpl.h (+4/-1) include/unity/scopes/internal/ScopeImpl.h (+2/-2) include/unity/scopes/internal/ScopeObject.h (+1/-3) include/unity/scopes/internal/ScopeObjectBase.h (+2/-1) include/unity/scopes/internal/SearchReplyImpl.h (+1/-2) include/unity/scopes/internal/smartscopes/SSQueryObject.h (+1/-3) include/unity/scopes/internal/smartscopes/SSScopeObject.h (+0/-2) include/unity/scopes/internal/smartscopes/SmartScopesClient.h (+5/-2) include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h (+7/-2) include/unity/scopes/internal/zmq_middleware/ZmqException.h (+4/-1) include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h (+10/-4) scoperegistry/DirWatcher.cpp (+9/-7) scoperegistry/ScopesWatcher.cpp (+4/-4) scoperegistry/scoperegistry.cpp (+1/-1) src/scopes/internal/ActivationQueryObject.cpp (+9/-8) src/scopes/internal/JsonCppNode.cpp (+5/-0) src/scopes/internal/JsonSettingsSchema.cpp (+5/-1) src/scopes/internal/Logger.cpp (+153/-44) src/scopes/internal/ObjectImpl.cpp (+1/-3) src/scopes/internal/PreviewQueryObject.cpp (+9/-8) src/scopes/internal/PreviewReplyImpl.cpp (+3/-5) src/scopes/internal/QueryCtrlImpl.cpp (+3/-4) src/scopes/internal/QueryObject.cpp (+12/-11) src/scopes/internal/RegistryImpl.cpp (+2/-2) src/scopes/internal/RegistryObject.cpp (+15/-21) src/scopes/internal/ReplyImpl.cpp (+7/-7) src/scopes/internal/ReplyObject.cpp (+4/-4) src/scopes/internal/ResultReplyObject.cpp (+2/-1) src/scopes/internal/RuntimeConfig.cpp (+125/-18) src/scopes/internal/RuntimeImpl.cpp (+59/-14) src/scopes/internal/ScopeImpl.cpp (+10/-10) src/scopes/internal/ScopeMetadataImpl.cpp (+1/-1) src/scopes/internal/ScopeObject.cpp (+12/-16) src/scopes/internal/SearchReplyImpl.cpp (+3/-4) src/scopes/internal/SettingsDB.cpp (+10/-7) src/scopes/internal/smartscopes/SSQueryObject.cpp (+8/-8) src/scopes/internal/smartscopes/SSRegistryObject.cpp (+7/-9) src/scopes/internal/smartscopes/SSScopeObject.cpp (+3/-4) src/scopes/internal/smartscopes/SmartScope.cpp (+6/-5) src/scopes/internal/smartscopes/SmartScopesClient.cpp (+32/-33) src/scopes/internal/zmq_middleware/ObjectAdapter.cpp (+45/-12) src/scopes/internal/zmq_middleware/ZmqException.cpp (+52/-3) src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp (+14/-14) src/scopes/internal/zmq_middleware/ZmqObject.cpp (+47/-44) src/scopes/internal/zmq_middleware/ZmqRegistry.cpp (+1/-1) src/scopes/internal/zmq_middleware/ZmqScope.cpp (+4/-5) test/gtest/scopes/Activation/Activation_test.cpp (+1/-1) test/gtest/scopes/Activation/Runtime.ini.in (+1/-0) test/gtest/scopes/Filters/Filters_test.cpp (+1/-1) test/gtest/scopes/Filters/Runtime.ini.in (+1/-0) test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp (+1/-1) test/gtest/scopes/IdleShutdown/Runtime.ini.in (+1/-0) test/gtest/scopes/Invocation/Invocation_test.cpp (+3/-3) test/gtest/scopes/Invocation/Runtime.ini.in (+1/-0) test/gtest/scopes/Registry/Runtime.ini.in (+1/-0) test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp (+2/-2) test/gtest/scopes/ReplyReaper/Runtime.ini.in (+1/-0) test/gtest/scopes/Runtime/Runtime.ini.in (+1/-0) test/gtest/scopes/Runtime/Runtime_test.cpp (+5/-5) test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp (+2/-2) test/gtest/scopes/internal/ResultReplyObject/Runtime.ini.in (+1/-0) test/gtest/scopes/internal/RuntimeConfig/BadLogDirSize.ini (+7/-0) test/gtest/scopes/internal/RuntimeConfig/BadLogFileSize.ini (+6/-0) test/gtest/scopes/internal/RuntimeConfig/CacheDir.ini (+1/-0) test/gtest/scopes/internal/RuntimeConfig/Complete.ini (+16/-0) test/gtest/scopes/internal/RuntimeConfig/ConfigDir.ini (+1/-0) test/gtest/scopes/internal/RuntimeConfig/LogDir.ini (+5/-0) test/gtest/scopes/internal/RuntimeConfig/NoLogDir.ini (+4/-0) test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp (+111/-2) test/gtest/scopes/internal/RuntimeImpl/Runtime.ini.in (+1/-0) test/gtest/scopes/internal/ScopeMetadataImpl/Runtime.ini.in (+1/-0) test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+4/-4) test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+2/-2) test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+2/-5) test/gtest/scopes/internal/smartscopes/smartscopesproxy/Runtime.ini.in (+1/-0) test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Runtime.ini.in (+1/-0) test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+3/-3) test/gtest/scopes/internal/zmq_middleware/RegistryI/Runtime.ini.in (+1/-0) test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Runtime.ini.in (+1/-0) test/gtest/scopes/stress/Runtime.ini.in (+1/-0) tools/zmq-monitor-host.py (+0/-46) tools/zmq-parser.py (+0/-85) |
To merge this branch: | bzr merge lp://staging/~michihenning/unity-scopes-api/add-logging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paweł Stołowski (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Marcus Tomlinson (community) | Approve | ||
Review via email:
|
Commit message
Stage 2. Added channel loggers. So far, there is only an "IPC" channel, which logs the Zmq layer messaging.
Added configurable logging to files and log file rotation. Tests unconditionally log to cerr still, so we can see what's going on. Log files are written to $HOME/.
Also simplified the way the various proxy and servant classes access the runtime and the logger. This removed a lot of redundant parameter passing.
Description of the change
Stage 2. Added channel loggers. So far, there is only an "IPC" channel, which logs the Zmq layer messaging.
Added configurable logging to files and log file rotation. Tests unconditionally log to cerr still, so we can see what's going on. Log files are written to $HOME/.
Also simplified the way the various proxy and servant classes access the runtime and the logger. This removed a lot of redundant parameter passing.
FAILED: Continuous integration, rev:558 jenkins. qa.ubuntu. com/job/ unity-scopes- api-ci/ 493/ jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- amd64-ci/ 18/console jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- armhf-ci/ 18/console jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- i386-ci/ 18/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scopes- api-ci/ 493/rebuild
http://