commit eef7cb7a4f704bf0d29e6d8ece5195dc3faabb69
author tierno <alfonso.tiernosepulveda@telefonica.com> Mon Nov 12 11:51:49 2018 +0100
committer tierno <alfonso.tiernosepulveda@telefonica.com> Mon Nov 12 15:34:28 2018 +0100
tree 0add82e1f63899db13c617017d1b584b64322e11
parent 1e9a329ca0085be33665e35d123394905bc46d74

Bug 559, changes to make optional intenal database key

Change-Id: I883bb3f874a917d5632b8aa9e937e08d2d7b5507
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

osm_common/dbmemory.py

diff --git a/osm_common/dbmemory.py b/osm_common/dbmemory.py
index b796e81..c2d9a11 100644
--- a/osm_common/dbmemory.py
+++ b/osm_common/dbmemory.py
@@ -38,7 +38,9 @@
         """
         if "logger_name" in config:
             self.logger = logging.getLogger(config["logger_name"])
-        self.master_password = config.get("masterpassword")
+        master_key = config.get("commonkey") or config.get("masterpassword")
+        if master_key:
+            self.set_secret_key(master_key)
 
     @staticmethod
     def _format_filter(q_filter):