Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-04-20 23:56:34 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

only list available services (ones with recent heartbeats)

Browse Source
This commit is contained in:
Noah Levitt 2016-04-19 21:14:20 +00:00
parent 72a94ed816
commit b5f5581477
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
webconsole/brozzler-webconsole/__init__.py
View File

@ -1,12 +1,14 @@
import flask
import rethinkstuff
import json
import logging
import sys
import os
import importlib
logging.basicConfig(stream=sys.stdout, level=logging.INFO,
format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")
# XXX flask does its own logging config
# import logging
# logging.basicConfig(stream=sys.stdout, level=logging.INFO,
# format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")
app = flask.Flask(__name__)
@ -20,6 +22,7 @@ SETTINGS= {
}
r = rethinkstuff.Rethinker(
SETTINGS['RETHINKDB_SERVERS'], db=SETTINGS['RETHINKDB_DB'])
service_registry = rethinkstuff.ServiceRegistry(r)
@app.route("/api/sites/<site_id>/queued_count")
@app.route("/api/site/<site_id>/queued_count")
@ -32,7 +35,7 @@ def queued_count(site_id):
@app.route("/api/sites/<site_id>/queue")
@app.route("/api/site/<site_id>/queue")
def queue(site_id):
logging.info("flask.request.args=%s", flask.request.args)
app.logger.info("flask.request.args=%s", flask.request.args)
start = flask.request.args.get("start", 0)
end = flask.request.args.get("end", start + 90)
queue_ = r.table("pages").between(
@ -55,7 +58,7 @@ def page_count(site_id):
@app.route("/api/site/<site_id>/pages")
def pages(site_id):
"""Pages already crawled."""
logging.info("flask.request.args=%s", flask.request.args)
app.logger.info("flask.request.args=%s", flask.request.args)
start = int(flask.request.args.get("start", 0))
end = int(flask.request.args.get("end", start + 90))
pages_ = r.table("pages").between(
@ -89,12 +92,12 @@ def job(job_id):
@app.route("/api/workers")
def workers():
workers_ = r.table("services").filter({"role":"brozzler-worker"}).run()
workers_ = service_registry.available_services("brozzler-worker")
return flask.jsonify(workers=list(workers_))
@app.route("/api/services")
def services():
services_ = r.table("services").run()
services_ = service_registry.available_services()
return flask.jsonify(services=list(services_))
@app.route("/api/jobs")

3
webconsole/requirements.txt
View File

@ -1,3 +1,2 @@
git+https://github.com/mitsuhiko/flask.git
rethinkstuff
rethinkstuff>=0.1.5