Log current device ID

Allow logger to set global prefix
Used to indicate current device
Store USB path when used to connection as well

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>

2 files changed, 10 insertions, 0 deletions

diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h
index 7ce432f..5a76616 100644
--- a/include/NitrokeyManager.h
+++ b/include/NitrokeyManager.h
@@ -203,6 +203,11 @@ char * strndup(const char* str, size_t maxlen);
 
         static shared_ptr <NitrokeyManager> _instance;
         std::shared_ptr<Device> device;
+        std::string current_device_id;
+    public:
+        const string get_current_device_id() const;
+
+    private:
         std::unordered_map<std::string, shared_ptr<Device> > connected_devices;
         std::unordered_map<std::string, shared_ptr<Device> > connected_devices_byID;
 
diff --git a/include/log.h b/include/log.h
index 89eda56..b969b81 100644
--- a/include/log.h
+++ b/include/log.h
@@ -86,6 +86,11 @@ namespace nitrokey {
     private:
       LogHandler *mp_loghandler;
       Loglevel m_loglevel;
+      static std::string prefix;
+    public:
+      static void setPrefix(std::string prefix = std::string());
+
+    private:
 
       static Log *mp_instance;
     };