aboutsummaryrefslogtreecommitdiffstats
path: root/python/citco_submission.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/citco_submission.py')
-rw-r--r--python/citco_submission.py28
1 files changed, 16 insertions, 12 deletions
diff --git a/python/citco_submission.py b/python/citco_submission.py
index a6c46aa1..6ded8224 100644
--- a/python/citco_submission.py
+++ b/python/citco_submission.py
@@ -1,17 +1,20 @@
-from stat import S_ISREG
import time
-from contextlib import contextmanager
-from report_ops.utils import CitcoSubmission
-from paramiko.ssh_exception import SSHException
import logging
+from stat import S_ISREG
+from paramiko.ssh_exception import SSHException
+
+from report_ops.status import CitcoSubmission
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
def close_and_reconnect():
retries = 5
for i in range(retries):
try:
- CitcoSubmission._sftp.client.close()
- CitcoSubmission.init_sftp()
+ CitcoSubmission._client.client.close()
+ CitcoSubmission.init_client("citco", folder="/outgoing/notifications")
except (SSHException, OSError) as e:
if i == retries - 1:
raise e
@@ -22,18 +25,19 @@ def close_and_reconnect():
def run():
- CitcoSubmission.init_sftp()
+ CitcoSubmission.init_client("citco", folder="/outgoing/notifications")
while True:
try:
- for f in CitcoSubmission._sftp.client.listdir_iter():
+ for f in CitcoSubmission._client.client.listdir_iter(
+ "/outgoing/notifications"
+ ):
if S_ISREG(f.st_mode):
try:
CitcoSubmission.process(f.filename)
except ValueError as e:
- logging.error(e)
- continue
- CitcoSubmission.commit()
- except (SSHException, OSError):
+ logger.info(e)
+ except (SSHException, OSError) as e:
+ logger.info(e)
close_and_reconnect()
time.sleep(60)
CitcoSubmission.check_cache()