Merge branch 'master' of git.clkl.de:agp8x/weatherstation-influx

snapshotter/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3"
+version: "2"
 services:
  test:
   build: src

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 = 10
 	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)

snapshotter/src/snapshot.py

@@ -53,12 +53,12 @@ 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()
-	
-