[2854] added some minimal behavior for memgr.

diff --git a/src/bin/memmgr/memmgr.py.in b/src/bin/memmgr/memmgr.py.in
index 5f21334671ebaaaa5ea5c1c4f087c3428dcff923..c59e7f36a909cd1079273a8a11fcbc5997fbf20c 100755 (executable)
--- a/src/bin/memmgr/memmgr.py.in
+++ b/src/bin/memmgr/memmgr.py.in
@@ -15,8 +15,24 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import os
+import sys
+import signal
 
-import sys; sys.path.append('@@PYTHONPATH@@')
+sys.path.append('@@PYTHONPATH@@')
+import isc.log
+from isc.log_messages.memmgr_messages import *
+from isc.server_common.bind10_server import BIND10Server
+
+MODULE_NAME = 'memmgr'
+
+isc.log.init('b10-memmgr', buffer=True)
+logger = isc.log.Logger(MODULE_NAME)
+
+class Memmgr(BIND10Server):
+    def _config_handler(self, new_config):
+        pass
 
 if '__main__' == __name__:
-    pass
+    mgr = Memmgr()
+    sys.exit(mgr.run(MODULE_NAME))

diff --git a/src/bin/memmgr/memmgr.spec b/src/bin/memmgr/memmgr.spec
index 247b012386c7c897d0d4980ee17581c2633f766c..09a1971d761c708eccfa7a187fc347c6465bd22a 100644 (file)
--- a/src/bin/memmgr/memmgr.spec
+++ b/src/bin/memmgr/memmgr.spec
@@ -2,8 +2,6 @@
   "module_spec": {
     "module_name": "Memmgr",
     "config_data": [
-      {
-      }
     ],
     "commands": [
       {
@@ -20,4 +18,3 @@
     ]
   }
 }
-

diff --git a/src/bin/memmgr/memmgr_messages.mes b/src/bin/memmgr/memmgr_messages.mes
index a59bcc35e283769004f5ec2794b16fe449552efa..df0872d261e74ab50a343e94549eda44ca3904a9 100644 (file)
--- a/src/bin/memmgr/memmgr_messages.mes
+++ b/src/bin/memmgr/memmgr_messages.mes
@@ -15,3 +15,5 @@
 # When you add a message to this file, it is a good idea to run
 # <topsrcdir>/tools/reorder_message_file.py to make sure the
 # messages are in the correct order.
+
+% MEMMGR_CONFIG_UPDATE received new configuration: %1

diff --git a/src/bin/memmgr/tests/memmgr_test.py b/src/bin/memmgr/tests/memmgr_test.py
index 3699fcf26e40c4b95118733c6215c8e68d2dcac1..82f5906dd43cfeaa29c2084c70961218957f4983 100755 (executable)
--- a/src/bin/memmgr/tests/memmgr_test.py
+++ b/src/bin/memmgr/tests/memmgr_test.py
@@ -13,9 +13,19 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-import isc.log
 import unittest
 
+import isc.log
+import isc.config
+import memmgr
+
+class MockMemmgr(memmgr.Memmgr):
+    pass
+
+class TestMemmgr(unittest.TestCase):
+    def setUp(self):
+        self.__mgr = MockMemmgr()
+
 if __name__== "__main__":
     isc.log.resetUnitTestRootLogger()
     unittest.main()