SHA1
--- a/deployment/gunicorn.conf
+++ b/deployment/gunicorn.conf
@@ -3,6 +3,7 @@
 
				 APP_NAME = "test"
			
 
				 
			
 
				 bind = "unix:/var/run/%s.sock" % APP_NAME
			
 
				+#bind = '127.0.0.1:8000'
			
 
				 
			
 
				 workers = 1
			
 
				 worker_class = "gevent"
			
@@ -11,7 +12,7 @@ timeout = 60
 
				 
			
 
				 daemon = False
			
 
				 pidfile = "/var/run/%s.pid" % APP_NAME
			
 
				-chdir = "/root/project/test/project"
			
 
				+chdir = "/root/project/test/project/"
			
 
				 
			
 
				 errorlog = "/data/log/web/%s.log" % APP_NAME
			
 
				 loglevel = "info"
			
--- a/deployment/test.ini
+++ b/deployment/test.ini
@@ -1,4 +1,8 @@
 
				 [program:test]
			
 
				+<<<<<<< HEAD
			
 
				+environment = CONFIG_NAME="qcloud"
			
 
				+=======
			
 
				+>>>>>>> e196dadc1dc4388e56f07c7720b4fba32d75c300
			
 
				 directory = /root/project/test/project/
			
 
				 command = /usr/bin/gunicorn -c deployment/gunicorn.conf views:app
			
 
				 stdout_logfile = /data/log/web/test.sup.log
			
--- a/views.pyc
+++ b/views.pyc
Autor	SHA1 Mensaxe	Data
shenggh	bb1ad7fd63 add	%!s(int64=6) %!d(string=hai) anos
shenggh	bb0ef0ff8b Merge branch 'master' of http://git.shenggh.top/shenggh/project	%!s(int64=6) %!d(string=hai) anos
shenggh	b09f316a9a Merge branch 'master' of http://47.101.46.124:3000/shenggh/project	%!s(int64=6) %!d(string=hai) anos
Gogs	31c01b8138 Merge branch 'master' of http://47.101.46.124:3000/shenggh/project	%!s(int64=6) %!d(string=hai) anos
Gogs	8c86914e54 Merge branch 'master' of http://47.101.46.124:3000/shenggh/project	%!s(int64=6) %!d(string=hai) anos
Gogs	8f43d09a36 Merge branch 'master' of http://47.101.46.124:3000/shenggh/project	%!s(int64=6) %!d(string=hai) anos
Gogs	6e0401257a Merge branch 'master' of http://47.101.46.124:3000/shenggh/project	%!s(int64=6) %!d(string=hai) anos
Gogs	a33e171243 add	%!s(int64=6) %!d(string=hai) anos
Gogs	0fb8b4fa68 a	%!s(int64=6) %!d(string=hai) anos