From 7b7b6954df16d1b172f59020c97968f895a8d5ad Mon Sep 17 00:00:00 2001
From: agp8x <agp8x@agp8x-server2>
Date: Sat, 4 Aug 2018 10:20:22 +0200
Subject: [PATCH] deployment fixes

---
 snapshotter/docker-compose.yml | 4 ++--
 snapshotter/src/scheduler.py   | 6 +++++-
 snapshotter/src/snapshot.py    | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/snapshotter/docker-compose.yml b/snapshotter/docker-compose.yml
index 31a588d..2710148 100644
--- a/snapshotter/docker-compose.yml
+++ b/snapshotter/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "2"
 services:
  test:
   build: src
@@ -7,4 +7,4 @@ services:
    - ./data:/data
   env_file: env
   working_dir: /app
-  command: python3 scheduler.py
\ No newline at end of file
+  command: python3 scheduler.py
diff --git a/snapshotter/src/scheduler.py b/snapshotter/src/scheduler.py
index a9cfbe8..ebefa59 100644
--- a/snapshotter/src/scheduler.py
+++ b/snapshotter/src/scheduler.py
@@ -5,6 +5,8 @@ import schedule
 
 import snapshot
 
+logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
+
 log = logging
 
 def setup(interval=10):
@@ -14,9 +16,11 @@ if __name__ == "__main__":
 	interval = 1
 	sleep = (interval*60) / 10.0
 	setup(interval)
+	snapshot.update()
 	while True:
 		try:
 			time.sleep(sleep)
+			log.info("run")
 			schedule.run_pending()
 		except Exception as e:
-			log.exception(e)
\ No newline at end of file
+			log.exception(e)
diff --git a/snapshotter/src/snapshot.py b/snapshotter/src/snapshot.py
index 3377c79..77de810 100644
--- a/snapshotter/src/snapshot.py
+++ b/snapshotter/src/snapshot.py
@@ -48,17 +48,17 @@ def _update(auth, ssh_config, day=today()):
 
 def auth_from_env():
 	return (os.getenv("USER"), os.getenv("PASSWORD"))
-	
+
 def ssh_from_env():
 	return SSHConfig(user=os.getenv("SSH_USER"), password=os.getenv("SSH_PASSWORD"), host=os.getenv("SSH_HOST"), port=os.getenv("SSH_PORT", 22), dir=os.getenv("SSH_DIR", "/"))
 
 def update():
+	log.info("run update")
 	auth = auth_from_env()
 	config = ssh_from_env()
 	_update(auth, config)
 
 
 if __name__ == "__main__":
+	logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
 	update()
-	
-	
\ No newline at end of file