Add salmon support (WIP)

[friends.git] / friends / server.py

diff --git a/friends/server.py b/friends/server.py
index 1fbff40189499c67f3a2d3b9d5a88b035e2fd776..0d0b8466344f9c6468cde03d529324558f4dd818 100755 (executable)
--- a/friends/server.py
+++ b/friends/server.py
@@ -5,6 +5,7 @@ import os
 import os.path
 import tornado.httpserver
 import tornado.httpclient as httpclient
 import os.path
 import tornado.httpserver
 import tornado.httpclient as httpclient

+import salmoning

 import sqlite3
 import arrow
 import datetime
 import sqlite3
 import arrow
 import datetime


@@ -151,6 +152,7 @@ class UserHandler(tornado.web.RequestHandler):
 application = tornado.web.Application([
     (r"/.well-known/host-meta", XrdHandler),
     (r"/.well-known/webfinger", FingerHandler),
 application = tornado.web.Application([
     (r"/.well-known/host-meta", XrdHandler),
     (r"/.well-known/webfinger", FingerHandler),

+    (r"/salmon/(.+)", SalmonHandler),

     (r"/user/(.+)", UserHandler),
     (r"/hub", PushHandler),
     ],debug=True,**settings)
     (r"/user/(.+)", UserHandler),
     (r"/hub", PushHandler),
     ],debug=True,**settings)