diff --git a/sarracenia/config.py b/sarracenia/config.py index 6fe3301d8..1ed3f8fad 100755 --- a/sarracenia/config.py +++ b/sarracenia/config.py @@ -2064,7 +2064,7 @@ def sundew_matchPattern(self, BN, EN, BP, keywd, defval): return defval - def variableExpansion(self, cdir, message=None ): + def variableExpansion(self, cdir, message=None ) -> str: """ replace substitution patterns, variable substitutions as described in https://metpx.github.io/sarracenia/Reference/sr3_options.7.html#variables diff --git a/sarracenia/flowcb/poll/airnow.py b/sarracenia/flowcb/poll/airnow.py index 24206d7a0..c814aab26 100755 --- a/sarracenia/flowcb/poll/airnow.py +++ b/sarracenia/flowcb/poll/airnow.py @@ -49,7 +49,7 @@ def poll(self): logger.info(last_poll) fakeStat = paramiko.SFTPAttributes() - fakeStat.st_size = resp.headers['content-length'] + fakeStat.st_size = int(resp.headers['content-length']) # convert datetime to numeric timestamp from beginning of POSIX epoch. fakeStat.st_mtime = mtime.timestamp() diff --git a/sarracenia/flowcb/scheduled/wiski.py b/sarracenia/flowcb/scheduled/wiski.py index 69b550730..2c2d493a9 100644 --- a/sarracenia/flowcb/scheduled/wiski.py +++ b/sarracenia/flowcb/scheduled/wiski.py @@ -163,6 +163,7 @@ def gather(self): # placeholder then = now - self.ts_length logger.info( f"stations: {k.get_station_list().station_id} " ) + directory=self.o.variableExpansion( self.o.directory ) for station_id in k.get_station_list().station_id: diff --git a/sarracenia/sr.py b/sarracenia/sr.py index 559066479..e0dc11ace 100755 --- a/sarracenia/sr.py +++ b/sarracenia/sr.py @@ -2438,8 +2438,8 @@ def status(self): txCumulativeFileRate += transferTxFileRate txCumulativeDataRate += transferTxByteRate - rxCumulativeMessageByteRate += msgRate - rxCumulativeMessageRate += byteRate + rxCumulativeMessageByteRate += byteRate + rxCumulativeMessageRate += msgRate @@ -2537,9 +2537,9 @@ def status(self): print( '\t Pub/Sub Received: %s/s (%s/s), Sent: %s/s (%s/s) Queued: %d Retry: %d, Mean lag: %02.2fs' % ( naturalSize(rxCumulativeMessageRate).replace("B","m").replace("myte","msg"), \ - naturalSize(rxCumulativeMessageRate),\ + naturalSize(rxCumulativeMessageByteRate),\ naturalSize(txCumulativeMessageRate).replace("B","m").replace("myte","msg"),\ - naturalSize(txCumulativeMessageRate), + naturalSize(txCumulativeMessageByteRate), rxCumulativeMessagesQueued, rxCumulativeMessagesRetry, CumulativeMeanLag )) print( '\t Data Received: %s/s (%s/s), Sent: %s/s (%s/s) ' % (