diff --git a/logger/log/PyLog.txt b/logger/log/PyLog.txt index 900f54c..4f60e02 100644 --- a/logger/log/PyLog.txt +++ b/logger/log/PyLog.txt @@ -86,3 +86,4 @@ 2021-04-02 09:27:42.781175 Caught error: Connection closed by server. 2021-04-08 11:19:48.305652 Caught error: Error 111 connecting to 127.0.0.1:6379. Connection refused. 2021-04-09 09:35:39.271878 Caught error: Error 111 connecting to 127.0.0.1:6379. Connection refused. +2021-04-12 09:44:47.671178 Caught error: Error while reading from socket: (104, 'Connection reset by peer') diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index 0be510b..195364c 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -31,7 +31,6 @@ redSrv0.set(redSampleFreq,startingSampleFreq) #se non c'รจ un valore nei campi di redis, popolo il db redSrv0.set('SETTINGS:LOG:STATUS',0) -redisTime = 'RTDATA:TIME:SRV' if redSrv0.get('SETTINGS:PASSWORD:CURRENT') is None: redSrv0.set('SETTINGS:PASSWORD:CURRENT',"-") if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None: @@ -56,7 +55,9 @@ try: #funzione salva time+data di log e otto valori su redis def redisSave(CHvalue): redLastLog = 'RTDATA:TIME:LOG' - lastLog = datetime.datetime.now() + dateFormat ="%d/%m/%Y %H:%M:%S" + rawLastLog = datetime.datetime.now() + lastLog = rawLastLog.strftime(dateFormat) redSrv0.set(redLastLog,str(lastLog)) for chIndex in range(0,8,+1): redAreaIn = 'RTDATA:CH:'+str(chIndex) @@ -93,8 +94,11 @@ try: #ciclo principale while(1): + redisTime = 'RTDATA:TIME:SRV' now = datetime.datetime.now() - redSrv0.set(redisTime,str(now)) + dateFormat ="%d/%m/%Y %H:%M:%S" + lastLog = now.strftime(dateFormat) + redSrv0.set(redisTime,str(lastLog)) CHvalue = CH.ADS1256_GetAll() redisSave(CHvalue) # riporto ultima esecuzione ad adesso diff --git a/server/FTServer.py b/server/FTServer.py index fbc422f..703e059 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -118,7 +118,7 @@ def api_channels_current(): savedPwd = getRedisVal('SETTINGS:PASSWORD:CURRENT') if savedPwd is None: redSrv0.set('SETTINGS:PASSWORD:CURRENT',"") - # tutto false + # on load tutto false showDiv1 = 0 showDiv2 = 0 showDiv3 = 0 @@ -129,7 +129,6 @@ def api_channels_current(): elif savedPwd == "viaZavaritt152": showDiv2 = 1 showDiv3 = 1 - #funzione api_channels_all: legge direttamente da redis, ritorna jsonify result = { 'numCh' : numCh, diff --git a/server/templates/about.html b/server/templates/about.html index 11c57f0..e93423b 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -4,8 +4,8 @@
-
+ +

FT Logger

@@ -13,7 +13,7 @@
Steamware srl 2021
- Analog and Digital reader and logger software + Analog/Digital logger software
diff --git a/server/templates/home.html b/server/templates/home.html index 7deb7f9..c8ec7c9 100644 --- a/server/templates/home.html +++ b/server/templates/home.html @@ -5,10 +5,10 @@ -
+

diff --git a/server/templates/layout.html b/server/templates/layout.html index 51b4f0a..9488401 100644 --- a/server/templates/layout.html +++ b/server/templates/layout.html @@ -9,7 +9,7 @@ {{ title }} - + @@ -18,7 +18,8 @@
-
- +
@@ -307,7 +306,7 @@
Cartella attuale:  
/
Sessione attuale:  
/
-
+

@@ -331,10 +330,8 @@
-
-
-

-
+
+

diff --git a/server/templates/settings.html b/server/templates/settings.html index 3d21a56..2b22445 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -141,7 +141,7 @@
Password:   - +