build: win32

Author: popov83

mamonsu/lib/default_config.py

@@ -51,7 +51,7 @@ def default_config_path():
         if platform.LINUX:
             return '/etc/mamonsu/agent.conf'
         elif platform.WINDOWS:
-            return 'C:\\mamonsu\\agent_win32.conf'
+            return 'agent_win32.conf'
 
     @staticmethod
     def get_logger_level(level):

mamonsu_win32.spec

@@ -45,7 +45,9 @@ a = Analysis(['mamonsu_win32.py'],
                 'mamonsu.tools.sysinfo',
                 'mamonsu.tools.tune',
                 'mamonsu.tools.zabbix_cli',
-                'mamonsu.plugins.common.health'
+                'mamonsu.plugins.common.health',
+                'mamonsu.plugins.common',
+                'win32timezone'
              ],
              hookspath=[],
              runtime_hooks=[],

service_win32.py

@@ -2,14 +2,13 @@
 import win32service
 import win32event
 import win32evtlogutil
-import servicemanager
+#import servicemanager
 import os
 
 from threading import Thread
 from mamonsu.lib.config import Config
 from mamonsu.lib.supervisor import Supervisor
 
-
 class MamonsuSvc(win32serviceutil.ServiceFramework):
 
     _svc_name_ = 'mamonsu'
@@ -31,23 +30,24 @@ def SvcDoRun(self):
         exe_dir = os.path.dirname(os.path.dirname(__file__))
         os.chdir(exe_dir)
 
-        win32evtlogutil.ReportEvent(
-            self._svc_name_,
-            servicemanager.PYS_SERVICE_STARTED,
-            0,
-            servicemanager.EVENTLOG_INFORMATION_TYPE,
-            (self._svc_name_, ''))
+        # win32evtlogutil.ReportEvent(
+        #     self._svc_name_,
+        #     servicemanager.PYS_SERVICE_STARTED,
+        #     0,
+        #     servicemanager.EVENTLOG_INFORMATION_TYPE,
+        #     (self._svc_name_, ''))
 
         config_file = os.path.join(exe_dir, 'agent_win32.conf')
-        config = Config(config_file)
+#        config = Config(config_file)
+        config = Config('c:\\mamonsu\\agent_win32.conf')
 
         supervisor = Supervisor(config)
-        win32evtlogutil.ReportEvent(
-            self._svc_name_,
-            servicemanager.PYS_SERVICE_STOPPED,
-            0,
-            servicemanager.EVENTLOG_INFORMATION_TYPE,
-            (self._svc_name_, ''))
+        # win32evtlogutil.ReportEvent(
+        #     self._svc_name_,
+        #     servicemanager.PYS_SERVICE_STOPPED,
+        #     0,
+        #     servicemanager.EVENTLOG_INFORMATION_TYPE,
+        #     (self._svc_name_, ''))
 
         thread = Thread(target=supervisor.start)
         thread.daemon = True
@@ -57,12 +57,12 @@ def SvcDoRun(self):
             rc = win32event.WaitForSingleObject(
                 self.hWaitStop, win32event.INFINITE)
             if rc == win32event.WAIT_OBJECT_0:
-                win32evtlogutil.ReportEvent(
-                    self._svc_name_,
-                    servicemanager.PYS_SERVICE_STOPPED,
-                    0,
-                    servicemanager.EVENTLOG_INFORMATION_TYPE,
-                    (self._svc_name_, ''))
+                # win32evtlogutil.ReportEvent(
+                #     self._svc_name_,
+                #     servicemanager.PYS_SERVICE_STOPPED,
+                #     0,
+                #     servicemanager.EVENTLOG_INFORMATION_TYPE,
+                #     (self._svc_name_, ''))
                 break
 
 

service_win32.spec

@@ -3,7 +3,7 @@
 block_cipher = None
 
 
-a = Analysis(['mamonsu_win32.py'],
+a = Analysis(['service_win32.py'],
              pathex=['C:\\data\\mamonsu'],
              binaries=[],
              datas=[],
@@ -45,7 +45,9 @@ a = Analysis(['mamonsu_win32.py'],
                 'mamonsu.tools.sysinfo',
                 'mamonsu.tools.tune',
                 'mamonsu.tools.zabbix_cli',
-                'mamonsu.plugins.common.health'
+                'mamonsu.plugins.common.health',
+                'mamonsu.plugins.common',
+                'win32timezone'
             ],
              hookspath=[],
              runtime_hooks=[],
@@ -62,11 +64,11 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           [],
-          name='mamonsu',
+          name='service_win32',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
           upx_exclude=[],
           runtime_tmpdir=None,
-          console=True )
+          console=True )