sciveo 0.1.33__tar.gz → 0.1.34__tar.gz

{sciveo-0.1.33 → sciveo-0.1.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.33
+Version: 0.1.34
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.33 → sciveo-0.1.34}/sciveo/cli.py

@@ -31,7 +31,7 @@ def main():
   parser.add_argument('--port', type=int, default=22, help='Host port number, used for network ops')
   parser.add_argument('--localhost', type=bool, default=False, help='Add localhost to list of hosts')
   parser.add_argument('--input-path', type=str, help='Input Path')
-  parser.add_argument('--output-path', type=str, help='Output Path')
+  parser.add_argument('--output-path', type=str, default=None, help='Output Path')
   parser.add_argument('--width', type=str, default=None, help='width')
   parser.add_argument('--height', type=str, default=None, help='height')
   parser.add_argument('--rate', type=int, help='Rate number')
@@ -41,7 +41,7 @@ def main():
 
   if args.command == 'monitor':
     from sciveo.monitoring.start import MonitorStart
-    MonitorStart(period=args.period, block=args.block)()
+    MonitorStart(period=args.period, block=args.block, output_path=args.output_path)()
   elif args.command == 'scan':
     from sciveo.network.tools import NetworkTools
     NetworkTools(timeout=args.timeout, localhost=args.localhost).scan_port(port=args.port, network=args.net)
@@ -53,7 +53,7 @@ def main():
       default_lines = [
         "secret_access_key=<your secret access key>",
         "api_base_url=https://sciveo.com",
-        "log_min_level=DEBUG"
+        "sci_log_level=DEBUG"
       ]
       with open(os.path.join(base_path, "default"), 'w') as fp:
         for line in default_lines:

{sciveo-0.1.33 → sciveo-0.1.34}/sciveo/monitoring/monitor.py

@@ -12,6 +12,7 @@
 import os
 import subprocess
 import time
+import json
 import datetime
 import socket
 import psutil
@@ -43,8 +44,11 @@ class MonitorTools:
 
 
 class BaseMonitor(DaemonBase):
-  def __init__(self, period=5):
+  def __init__(self, period=5, output_path=None):
     super().__init__(period=period)
+    self.output_path = output_path
+    if self.output_path is not None and os.path.isdir(self.output_path):
+      self.output_path = os.path.join(self.output_path, "sciveo_monitor.json")
 
     self.data = {
       "CPU": {},
@@ -78,6 +82,17 @@ class BaseMonitor(DaemonBase):
   def __call__(self):
     return self.data
 
+  def output_write(self):
+    if os.path.isfile(self.output_path):
+      with open(self.output_path, "rb+") as fp:
+        fp.seek(-2, 2)
+        fp.truncate()
+      with open(self.output_path, "a") as fp:
+        fp.write(f", {json.dumps(self.data)}]\n")
+    else:
+      with open(self.output_path, "w") as fp:
+        fp.write(json.dumps([self.data]) + "\n")
+
   def loop(self):
     self.get_cpu_usage()
     self.get_temperatures()
@@ -91,6 +106,12 @@ class BaseMonitor(DaemonBase):
 
     api_result = self.api.POST_SCI("monitor", {"data": self.data})
 
+    try:
+      if self.output_path is not None:
+        self.output_write()
+    except Exception as e:
+      error(e, "writing failed for", self.output_path)
+
     debug(self(), "api_result", api_result)
 
   def tail_logs(self):

{sciveo-0.1.33 → sciveo-0.1.34}/sciveo/monitoring/start.py

@@ -22,7 +22,8 @@ class MonitorStart:
       "period": 120,
       "block": True,
       "fork": False,
-      "fork_type": 0
+      "fork_type": 0,
+      "output_path": None,
     }
     self.arguments = {}
     for k, v in self.default_arguments.items():
@@ -59,7 +60,7 @@ class MonitorStart:
 
   def start(self):
     period = max(self.arguments["period"], 5)
-    mon = BaseMonitor(period=period)
+    mon = BaseMonitor(period=period, output_path=self.arguments["output_path"])
     mon.start()
     mon.join()
 

sciveo-0.1.34/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.34'

{sciveo-0.1.33 → sciveo-0.1.34}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.33
+Version: 0.1.34
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.33/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.33'