JoostSijm 6 роки тому
батько
коміт
894fea5933
2 змінених файлів з 22 додано та 8 видалено
  1. 2 4
      app/flaskr.py
  2. 20 4
      app/util/job.py

+ 2 - 4
app/flaskr.py

@@ -40,7 +40,7 @@ def tutorial_image_page(image):
 @app.route('/typeset', methods=['GET', 'POST'])
 def typeset():
     """Add job to schedeuler"""
-    job.add()
+    job.typeset_add()
     return jsonify(True)
 
 
@@ -53,9 +53,7 @@ def deploy():
     if len(signature) < 2 or not hmac.compare_digest(signature, digest):
         abort(400, 'Invalid signature')
 
-    subprocess.check_output(['git', 'pull'])
-    subprocess.check_output(['pipenv', 'sync'])
-    subprocess.check_output(['touch', 'flask.wsgi'])
+    job.upgrade_add()
     return jsonify(True)
 
 

+ 20 - 4
app/util/job.py

@@ -8,18 +8,27 @@ from datetime import datetime
 from app import scheduler
 
 
-def add():
+def typeset_add():
     """Schedule job"""
     job = scheduler.get_job("set")
     if job is None:
         job = scheduler.add_job(
             id="set",
-            func=run,
+            func=typeset_run,
             trigger="date",
         )
 
+def upgrade_add():
+    """Schedule job"""
+    job = scheduler.get_job("set")
+    if job is None:
+        job = scheduler.add_job(
+            id="set",
+            func=upgrade_run,
+            trigger="date",
+        )
 
-def run():
+def typeset_run():
     """Run the job"""
     print("Running")
     working_dir = os.getcwd()
@@ -57,5 +66,12 @@ def run():
     shutil.copyfile('master_article.png', '../app/static/tutorial/article.png')
 
 
+def upgrade_run():
+    """Upgrade to new version"""
+    subprocess.check_output(['git', 'pull'])
+    subprocess.check_output(['pipenv', 'sync'])
+    subprocess.check_output(['touch', 'flask.wsgi'])
+
 if __name__ == "__main__":
-    run.__module__ = "scheduler"
+    typeset_run.__module__ = "scheduler"
+    upgrade_run.__module__ = "scheduler"