Workon threads
This commit is contained in:
@@ -9,13 +9,21 @@ import os
|
||||
import getopt
|
||||
import sys
|
||||
import datetime
|
||||
|
||||
import threading
|
||||
|
||||
from flask import Flask, render_template, request, send_file, send_from_directory, safe_join, abort, redirect, url_for
|
||||
|
||||
# Local
|
||||
import store
|
||||
import fetch_site_status
|
||||
|
||||
ticker_thread = None
|
||||
|
||||
datastore = store.ChangeDetectionStore()
|
||||
messages = []
|
||||
running_update_threads={}
|
||||
|
||||
app = Flask(__name__, static_url_path='/static')
|
||||
app.config['STATIC_RESOURCES'] = "/app/static"
|
||||
|
||||
@@ -24,6 +32,26 @@ app.config['STATIC_RESOURCES'] = "/app/static"
|
||||
# Disables caching of the templates
|
||||
app.config['TEMPLATES_AUTO_RELOAD'] = True
|
||||
|
||||
# We use the whole watch object from the store/JSON so we can see if there's some related status in terms of a thread
|
||||
# running or something similar.
|
||||
@app.template_filter('format_last_checked_time')
|
||||
def _jinja2_filter_datetime(watch_obj, format="%Y-%m-%d %H:%M:%S"):
|
||||
|
||||
global running_update_threads
|
||||
if watch_obj['uuid'] in running_update_threads:
|
||||
if running_update_threads[watch_obj['uuid']].is_alive():
|
||||
return "Checking now.."
|
||||
|
||||
if watch_obj['last_checked'] == 0:
|
||||
return 'Never'
|
||||
|
||||
return datetime.datetime.utcfromtimestamp(int(watch_obj['last_checked'])).strftime(format)
|
||||
|
||||
@app.template_filter('format_timestamp')
|
||||
def _jinja2_filter_datetimestamp(timestamp, format="%Y-%m-%d %H:%M:%S"):
|
||||
if timestamp == 0:
|
||||
return 'Never'
|
||||
return datetime.datetime.utcfromtimestamp(timestamp).strftime(format)
|
||||
|
||||
@app.route("/", methods=['GET'])
|
||||
def main_page():
|
||||
@@ -50,17 +78,53 @@ def api_watch_add():
|
||||
#@todo add_watch should throw a custom Exception for validation etc
|
||||
datastore.add_watch(url=request.form.get('url'), tag=request.form.get('tag'))
|
||||
messages.append({'class':'ok', 'message': 'Saved'})
|
||||
launch_checks()
|
||||
return redirect(url_for('main_page'))
|
||||
|
||||
|
||||
@app.route("/api/checknow", methods=['GET'])
|
||||
def api_watch_checknow():
|
||||
global messages
|
||||
|
||||
uuid=request.args.get('uuid')
|
||||
|
||||
# dict would be better, this is a simple safety catch.
|
||||
for watch in datastore.data['watching']:
|
||||
if watch['uuid'] == uuid:
|
||||
# @todo cancel if already running?
|
||||
running_update_threads[uuid] = fetch_site_status.perform_site_check(uuid=uuid,
|
||||
datastore=datastore)
|
||||
running_update_threads[uuid].start()
|
||||
|
||||
return redirect(url_for('main_page'))
|
||||
# datastore.add_watch
|
||||
|
||||
|
||||
# Can be used whenever, launch threads that need launching to update the stored information
|
||||
def launch_checks():
|
||||
import fetch_site_status
|
||||
global running_update_threads
|
||||
|
||||
for watch in datastore.data['watching']:
|
||||
if watch['last_checked'] <= time.time() - 20:
|
||||
running_update_threads[watch['uuid']] = fetch_site_status.perform_site_check(uuid = watch['uuid'], datastore=datastore)
|
||||
running_update_threads[watch['uuid']].start()
|
||||
|
||||
def ticker_thread_check_time_launch_checks():
|
||||
|
||||
while True:
|
||||
print ("lanching")
|
||||
launch_checks()
|
||||
time.sleep(60)
|
||||
|
||||
|
||||
def main(argv):
|
||||
ssl_mode = False
|
||||
port = 5000
|
||||
|
||||
#@todo handle ctrl break
|
||||
ticker_thread = threading.Thread(target=ticker_thread_check_time_launch_checks).start()
|
||||
|
||||
|
||||
try:
|
||||
opts, args = getopt.getopt(argv, "sp:")
|
||||
except getopt.GetoptError:
|
||||
|
||||
Reference in New Issue
Block a user