From f68c3a68a87596d789d94c0b5583ca83faca6e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A5l=20Gr=C3=B8n=C3=A5s=20Drange?= <pgdr@statoil.com>
Date: Mon, 13 Feb 2017 23:11:39 +0100
Subject: [PATCH] added sysinfo for logging on startup

---
 bin/fby_client | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/bin/fby_client b/bin/fby_client
index d3e3b44..1952fa1 100755
--- a/bin/fby_client
+++ b/bin/fby_client
@@ -2,7 +2,7 @@
 import sys
 import os
 from serial import SerialException
-import datetime
+from datetime import datetime as dt
 import time
 import requests
 from traceback import format_exception
@@ -27,6 +27,25 @@ else:
     from sds011 import SDS011
 
 
+def get_sys_info():
+    """This gets basic system information to log on startup"""
+    sysname, nodename, release, version, machine = os.uname()
+    python_vs, python_cc = sys.version.split('\n')
+    req_vs = '0.0.0'
+    local_time = dt.now().isoformat()
+    try:
+        req_vs = requests.__version__
+    except:
+        pass
+    return {'sysname': sysname,
+            'nodename': nodename,
+            'release':  release,
+            'version': version,
+            'python': python_vs,
+            'pythoncc': python_cc,
+            'requests': req_vs,
+            'localtime': local_time}
+
 class FbyRunner(object):
 
     def __init__(self, argv):
@@ -109,7 +128,12 @@ class FbyRunner(object):
     def run(self):
         network_block( )
         self._config = DeviceConfig( CONFIG_FILE )
-        self._config.logMessage("Starting up")
+        sys_info = 'missing sys_info'
+        try:
+            sys_info = str(get_sys_info())
+        except:
+            pass
+        self._config.logMessage("Starting up", long_msg = sys_info)
         self._config.postGitVersion( )
 
         device_id = self._config.getDeviceID( )
@@ -135,10 +159,10 @@ class FbyRunner(object):
 def network_block():
     url = "http://www.google.com"
     timeout = 120
-    start = datetime.datetime.now()
+    start = dt.now()
     while True:
-        dt = datetime.datetime.now() - start
-        if dt.total_seconds() > timeout:
+        dt_now = dt.now() - start
+        if dt_now.total_seconds() > timeout:
             sys.exit("No network contact established - giving up")
 
         try: