# HG changeset patch # User Simon Cross # Date 1353442085 -7200 # Node ID 16344424dfcce929673a0e2a1815d4b009df0d91 # Parent 9bf1d649f5947ecd8f4f64d09f4fb6f0d0921e71 First attempt at irker logging from level server. diff -r 9bf1d649f594 -r 16344424dfcc mamba/forest.py --- a/mamba/forest.py Fri Dec 23 01:19:17 2011 +0200 +++ b/mamba/forest.py Tue Nov 20 22:08:05 2012 +0200 @@ -4,14 +4,16 @@ from flask import Flask, request, abort from datetime import datetime +from ConfigParser import SafeConfigParser import xmlrpclib import time import os import sys +import socket +import json app = Flask(__name__) -app.config['LEVEL_FOLDER'] = None # set later -app.config['CIA_PROJECT'] = None # set to activate CIA sending +app.config = None # set later def path(ctype): @@ -58,6 +60,7 @@ with open(levelpath, 'w') as level: level.write(leveldata) inform_cia(levelname, "New level uploaded.", branch="uncurated") + inform_irker(levelname, "New level uploaded.", branch="uncurated") return "Ssss." else: abort(405, "Post levels here. Hsss.") @@ -65,6 +68,7 @@ MAMBA_VERSION = "0.1" MAMBA_URL = "https://ctpug.org.za/hg/mamba" +IRKER_PORT = 6659 CIA_URL = "http://cia.navi.cx" CIA_MSG_TEMPLATE = """ + +The config file should look like: + +[main] +host=0.0.0.0 # optional +port=8000 +level_folder=./my/levels + +[irker] +host=localhost # optional +port=8001 +project=mamba-levels +channels=channel1,channel2 +""" + + if __name__ == "__main__": - if len(sys.argv) not in (3, 4): - print ("Usage: python -m mamba.forest " - " []") + if len(sys.argv) != 2: + print USAGE sys.exit(1) - host = '0.0.0.0' - port = int(sys.argv[1]) - level_folder = sys.argv[2] + app.config = ForestConfig([sys.argv[1]]) + main = app.config.main + for ctype in ("curated", "uncurated"): - folder = os.path.join(level_folder, ctype) + folder = os.path.join(main.level_folder, ctype) if not os.path.exists(folder): os.makedirs(folder) if not os.path.isdir(folder): @@ -136,7 +219,5 @@ sys.exit(1) cia_project = sys.argv[3] if len(sys.argv) > 3 else None - app.config['LEVEL_FOLDER'] = level_folder - app.config['CIA_PROJECT'] = cia_project # app.debug = True - app.run(host=host, port=port) + app.run(host=main.host, port=main.port)