diff --git a/liveMonitor.py b/liveMonitor.py index 629ebd2..fb7463f 100644 --- a/liveMonitor.py +++ b/liveMonitor.py @@ -108,6 +108,7 @@ def monitorLogFile(camloc, rmscfg): logfs.sort(key=lambda x: os.path.getmtime(x)) logf = logfs[-1] loglines.close() + raise StopIteration else: if "Data directory" in line or 'New data directory' in line: newcapdir = line.split(' ')[5].strip() diff --git a/ukmonPostProc.py b/ukmonPostProc.py index 094d96f..73326e8 100644 --- a/ukmonPostProc.py +++ b/ukmonPostProc.py @@ -19,6 +19,7 @@ import RMS.ConfigReader as cr from importlib import import_module as impmod import logging +import logging.handlers import datetime from uploadToArchive import uploadToArchive, readIniFile diff --git a/uploadToArchive.py b/uploadToArchive.py index 02597fb..17e7494 100644 --- a/uploadToArchive.py +++ b/uploadToArchive.py @@ -28,6 +28,7 @@ log = logging.getLogger("ukmonlogger") logging.getLogger("paramiko").setLevel(logging.WARNING) + def readKeyFile(filename, inifvals): if not os.path.isfile(filename): log.error('Keyfile {} not downloaded. Check ssh key and station location with ukmon team.'.format(filename))