diff options
| author | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2015-01-29 18:12:01 +0100 |
|---|---|---|
| committer | Maciej J. Karpiuk <m.karpiuk2@samsung.com> | 2015-02-17 12:12:22 +0100 |
| commit | 3837791c10fdba135c4ceeb6d17c7eff0ed8d09b (patch) | |
| tree | b2394ffa7b4ba085ae9098d6705d83147310d2b6 /systemd | |
| parent | 2523f4d47ff685834b5b6e369379b2952bc7e39e (diff) | |
| download | key-manager-3837791c10fdba135c4ceeb6d17c7eff0ed8d09b.tar.gz key-manager-3837791c10fdba135c4ceeb6d17c7eff0ed8d09b.tar.bz2 key-manager-3837791c10fdba135c4ceeb6d17c7eff0ed8d09b.zip | |
Common logging setup for client and service
[Issue#] N/A
[Feature/Bug] N/A
[Problem] Client may use different logging method than service.
[Cause] Service reads environment flags from config file. Client doesn't
[Solution] Make the client read that file too and setup log system properly.
[Verification] Make changes to /etc/sysconfig/central-key-manager file and see
if both service and client uses the same logging setup (provider and log level)
File format is the following:
"
CKM_LOG_PROVIDER=<provider>
CKM_LOG_LEVEL=<level>
"
where:
<provider> is one of JOURNALD, DLOG, CONSOLE
<level> is <0..5>, 0 means not logs at all, 1 means errors only, 5 means all
Change-Id: I1662fe636f9987778345f8a02afa6fb77f7f1fe0
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | systemd/central-key-manager.service.in (renamed from systemd/central-key-manager.service) | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 7886c1d4..f9005e78 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -1,3 +1,6 @@ +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/central-key-manager.service.in + ${CMAKE_SOURCE_DIR}/systemd/central-key-manager.service @ONLY) + INSTALL(FILES ${CMAKE_SOURCE_DIR}/systemd/central-key-manager.service ${CMAKE_SOURCE_DIR}/systemd/central-key-manager.target diff --git a/systemd/central-key-manager.service b/systemd/central-key-manager.service.in index 3b55621a..469db7a8 100644 --- a/systemd/central-key-manager.service +++ b/systemd/central-key-manager.service.in @@ -8,7 +8,7 @@ ExecStart=/usr/bin/key-manager Sockets=central-key-manager-api-storage.socket Sockets=central-key-manager-api-control.socket Sockets=central-key-manager-api-ocsp.socket -EnvironmentFile=-/etc/sysconfig/central-key-manager +EnvironmentFile=-@SYSTEMD_ENV_FILE@ [Install] WantedBy=multi-user.target |