Update servicestack to be similar to aspnet

frameworks/C#/servicestack/bash_profile.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+export MONO_ROOT=${IROOT}/mono-3.6.0-install
+
+export PATH="$MONO_ROOT/bin:$PATH"
+
+# Needed to find Mono's shared libraries
+export LD_LIBRARY_PATH="$MONO_ROOT/lib"

frameworks/C#/servicestack/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends nginx xsp 
+fw_depends nginx xsp mono

frameworks/C#/servicestack/setup_nginx.py

@@ -3,54 +3,40 @@ import sys
 import setup_util
 import os
 
-root = os.getcwd() + "/servicestack"
-app = root + "/src"
-
 def start(args, logfile, errfile):
   if os.name == 'nt':
     return 1
   
-  setup_util.replace_text(app + "/Web.config", "localhost", args.database_host)
+  setup_util.replace_text("servicestack/src/Web.config", "localhost", args.database_host)
 
-  try:
-    # build
-    subprocess.check_call("rm -rf bin obj", shell=True, cwd=app, stderr=errfile, stdout=logfile)
-    subprocess.check_call("xbuild /p:Configuration=Release", shell=True, cwd=app, stderr=errfile, stdout=logfile)
-    subprocess.check_call("sudo chown -R $USER:$USER /usr/local/etc/mono", shell=True, stderr=errfile, stdout=logfile)
-    
-    # nginx
-    workers = 'worker_processes ' + str(args.max_threads) + ';'
-    subprocess.check_call('echo "upstream mono {\n' + ';\n'.join('\tserver 127.0.0.1:' + str(port) for port in range(9001, 9001 + args.max_threads)) + ';\n}" > ' + root + '/nginx.upstream.conf', shell=True, stderr=errfile, stdout=logfile);
-    subprocess.check_call('/usr/local/nginx/sbin/nginx -c ' + root + '/nginx.conf -g "' + workers + '"', shell=True, stderr=errfile, stdout=logfile)
-    
-    # fastcgi
-    for port in range(9001, 9001 + args.max_threads):
-      subprocess.Popen("MONO_OPTIONS=--gc=sgen fastcgi-mono-server4 /applications=/:. /socket=tcp:127.0.0.1:" + str(port) + " &", shell=True, cwd=app, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
+  # build
+  subprocess.check_call("rm -rf bin obj", shell=True, cwd="servicestack", stderr=errfile, stdout=logfile)
+  subprocess.check_call("xbuild /p:Configuration=Release", shell=True, cwd="servicestack/src", stderr=errfile, stdout=logfile)
+  subprocess.check_call("sudo chown -R $USER:$USER $MONO_ROOT", shell=True, stderr=errfile, stdout=logfile)
+  
+  # nginx
+  workers = 'worker_processes ' + str(args.max_threads) + ';'
+  subprocess.check_call('echo "upstream mono {\n' + ';\n'.join('\tserver 127.0.0.1:' + str(port) for port in range(9001, 9001 + args.max_threads)) + ';\n}" > $TROOT/nginx.upstream.conf', shell=True, stderr=errfile, stdout=logfile);
+  subprocess.check_call('sudo /usr/local/nginx/sbin/nginx -c $TROOT/nginx.conf -g "' + workers + '"', shell=True, stderr=errfile, stdout=logfile)
+  
+  # Start fastcgi for each thread
+  # To debug, use --printlog --verbose --loglevels=All
+  for port in range(9001, 9001 + args.max_threads):
+    # subprocess.Popen("MONO_OPTIONS=--gc=sgen fastcgi-mono-server4 /applications=/:. /socket=tcp:127.0.0.1:" + str(port) + " &", shell=True, cwd=app, stderr=errfile, stdout=logfile)
+    subprocess.Popen("MONO_OPTIONS=--gc=sgen fastcgi-mono-server4 --applications=/:%s/src --socket=tcp:127.0.0.1:%s " % (args.directory, port), shell=True, cwd="servicestack", stderr=errfile, stdout=logfile)
 
 def stop(logfile, errfile):
   if os.name == 'nt':
     return 0
   
-  #
+  # stop nginx
+  subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c $TROOT/nginx.conf -s stop", shell=True, stderr=errfile, stdout=logfile)
+
   # stop mono
-  #
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   out, err = p.communicate()
   for line in out.splitlines():
-    if 'mono-server' in line:
-      pid = int(line.split(None, 2)[1])
-      os.kill(pid, 15)
-
-  #
-  # stop nginx
-  #
-  p2 = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
-  out, err = p2.communicate()
-  for line in out.splitlines():
-    if 'nginx: master' in line:
+    if 'mono-server' in line and not 'run-ci' in line and not 'run-tests' in line:
       pid = int(line.split(None, 2)[1])
       os.kill(pid, 15)