shibuqam: make User serializable

[nit.git] / contrib / tnitter / src / tnitter.nit

diff --git a/contrib/tnitter/src/tnitter.nit b/contrib/tnitter/src/tnitter.nit
index 490fc07..949db77 100644 (file)
--- a/contrib/tnitter/src/tnitter.nit
+++ b/contrib/tnitter/src/tnitter.nit
@@ -21,6 +21,7 @@ import privileges
 
 import model
 import action
+import push
 
 redef class OptionContext
        var drop = new OptionUserAndGroup.for_dropping_privileges
@@ -29,8 +30,8 @@ redef class OptionContext
        init do add_option(drop, help)
 end
 
-# Avoid executing when running tests
-if "NIT_TESTING".environ == "true" then exit 0
+# Address and port of the listening socket
+fun tnitter_interface: String do return "localhost:8080"
 
 # Prepare options
 var opts = new OptionContext
@@ -42,14 +43,8 @@ if not opts.errors.is_empty or opts.help.value then
        exit 1
 end
 
-# If we can, we use port 80
-var interfac
-if sys.uid == 0 then # Are we root?
-       interfac = "localhost:80"
-else interfac = "localhost:8080"
-
 # Setup server
-var vh = new VirtualHost(interfac)
+var vh = new VirtualHost(tnitter_interface)
 var factory = new HttpFactory.and_libevent
 factory.config.virtual_hosts.add vh
 
@@ -58,8 +53,10 @@ var user_group = opts.drop.value
 if user_group != null then user_group.drop_privileges
 
 # Complete server config
-vh.routes.add new Route(null, new Tnitter)
+vh.routes.add new Route("/rest/", new TnitterREST)
+vh.routes.add new Route("/push/", new TnitterPush)
+vh.routes.add new Route(null, new TnitterWeb)
 
 # Run
-print "Launching server on http://{interfac} ..."
+print "Launching server on http://{tnitter_interface} ..."
 factory.run