From 26384b2fde9ed271e4d7ed0b9bdec77247d4cb97 Mon Sep 17 00:00:00 2001 From: Bartlomiej Grzelewski Date: Thu, 10 Jul 2014 11:38:17 +0200 Subject: [PATCH] Fix bugs. Socket activation did not work because systemd sockets names did not match socket names provided by services. Change-Id: Ice4a0db2eee0ab7d6b5ef60be0e2a5dabb41d69d --- src/manager/common/protocols.cpp | 6 +++--- src/manager/main/socket-manager.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/manager/common/protocols.cpp b/src/manager/common/protocols.cpp index adecdff..36f63d3 100644 --- a/src/manager/common/protocols.cpp +++ b/src/manager/common/protocols.cpp @@ -28,9 +28,9 @@ namespace CKM { -char const * const SERVICE_SOCKET_ECHO = "/tmp/.central-ckm-manager-echo.sock"; -char const * const SERVICE_SOCKET_CKM_CONTROL = "/tmp/.central-ckm-manager-api-control.sock"; -char const * const SERVICE_SOCKET_CKM_STORAGE = "/tmp/.central-ckm-manager-api-storage.sock"; +char const * const SERVICE_SOCKET_ECHO = "/tmp/.central-key-manager-echo.sock"; +char const * const SERVICE_SOCKET_CKM_CONTROL = "/tmp/.central-key-manager-api-control.sock"; +char const * const SERVICE_SOCKET_CKM_STORAGE = "/tmp/.central-key-manager-api-storage.sock"; DBDataType toDBDataType(KeyType key) { switch(key) { diff --git a/src/manager/main/socket-manager.cpp b/src/manager/main/socket-manager.cpp index db58139..73e90e4 100644 --- a/src/manager/main/socket-manager.cpp +++ b/src/manager/main/socket-manager.cpp @@ -472,7 +472,7 @@ int SocketManager::GetSocketFromSystemD( return fd; } } - LogInfo("No useable sockets were passed by systemd."); + LogError("No useable sockets were passed by systemd."); return -1; } -- 2.7.4