deployment fixes

master
agp8x 2018-08-04 10:20:22 +02:00
parent 90f302e39e
commit 7b7b6954df
3 changed files with 10 additions and 6 deletions

View File

@ -1,4 +1,4 @@
version: "3" version: "2"
services: services:
test: test:
build: src build: src
@ -7,4 +7,4 @@ services:
- ./data:/data - ./data:/data
env_file: env env_file: env
working_dir: /app working_dir: /app
command: python3 scheduler.py command: python3 scheduler.py

View File

@ -5,6 +5,8 @@ import schedule
import snapshot import snapshot
logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
log = logging log = logging
def setup(interval=10): def setup(interval=10):
@ -14,9 +16,11 @@ if __name__ == "__main__":
interval = 1 interval = 1
sleep = (interval*60) / 10.0 sleep = (interval*60) / 10.0
setup(interval) setup(interval)
snapshot.update()
while True: while True:
try: try:
time.sleep(sleep) time.sleep(sleep)
log.info("run")
schedule.run_pending() schedule.run_pending()
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)

View File

@ -48,17 +48,17 @@ def _update(auth, ssh_config, day=today()):
def auth_from_env(): def auth_from_env():
return (os.getenv("USER"), os.getenv("PASSWORD")) return (os.getenv("USER"), os.getenv("PASSWORD"))
def ssh_from_env(): 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", "/")) 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(): def update():
log.info("run update")
auth = auth_from_env() auth = auth_from_env()
config = ssh_from_env() config = ssh_from_env()
_update(auth, config) _update(auth, config)
if __name__ == "__main__": if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
update() update()