web - fixing version format and systemd status calls

superstes · Jan 4, 2022 · 2b0cd1a · 2b0cd1a
1 parent a26ba23
commit 2b0cd1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/code/web/base/ga/submodels/system.py b/code/web/base/ga/submodels/system.py
@@ -25,7 +25,7 @@ class SystemAgentModel(BaseModel):
         'svc_interval_status', 'svc_interval_reload', 'subprocess_timeout', 'sql_socket', 'sql_service', 'sql_config',
     ]
 
-    version = models.FloatField()
+    version = models.CharField(max_length=16)
     version_detail = models.CharField(max_length=64)
 
     path_root = models.CharField(max_length=255, default=config.SYS_DEFAULT_ROOT_PATH)
@@ -59,7 +59,7 @@ class SystemServerModel(BaseModel):
         'ga_cloud_ddns', 'sql_service', 'letsencrypt'
     ]
 
-    version = models.FloatField()
+    version = models.CharField(max_length=16)
     version_detail = models.CharField(max_length=64)
 
     path_core = models.CharField(max_length=255, default=config.SYS_DEFAULT_ROOT_PATH)

diff --git a/code/web/base/ga/subviews/system/service.py b/code/web/base/ga/subviews/system/service.py
@@ -13,8 +13,8 @@
 SYSTEMCTL = '/bin/systemctl'
 SHELL_SERVICE_STATUS = f"{SYSTEMCTL} is-active %s"
 SHELL_SERVICE_ENABLED = f"{SYSTEMCTL} is-enabled %s"
-SHELL_SERVICE_ACTIVE_TIMESTAMP = f"{SYSTEMCTL} show -p ActiveEnterTimestamp --value %s"
-SHELL_SERVICE_INACTIVE_TIMESTAMP = f"{SYSTEMCTL} show -p InactiveEnterTimestamp --value %s"
+SHELL_SERVICE_ACTIVE_TIMESTAMP = f"{SYSTEMCTL} show --property=ActiveEnterTimestamp %s"
+SHELL_SERVICE_INACTIVE_TIMESTAMP = f"{SYSTEMCTL} show --property=InactiveEnterTimestamp %s"
 TITLE = 'System service'