diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-05-12 10:32:07 -0400 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-05-12 10:32:07 -0400 |
| commit | f5b2e5f836b42946e4221cb7db49e04d40024ba6 (patch) | |
| tree | a116f2fdbd6ea9aae29293b81f7c9783e55e21ef | |
| parent | ca0b6dfa3838157f0eb5f15a8d52fa8dbf370477 (diff) | |
| parent | 83a10ce880f3eb15c7f6736aecece3ea41d9c3cd (diff) | |
| download | gitea-f5b2e5f836b42946e4221cb7db49e04d40024ba6.tar.gz gitea-f5b2e5f836b42946e4221cb7db49e04d40024ba6.zip | |
Merge pull request #177 from jacksonpan/master
modify the file path
| -rw-r--r-- | conf/etc/supervisord.conf (renamed from etc/supervisord.conf) | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | gogs_supervisord.sh | 11 | ||||
| -rw-r--r-- | tmp/readme.txt | 1 |
3 files changed, 15 insertions, 9 deletions
diff --git a/etc/supervisord.conf b/conf/etc/supervisord.conf index e273af3271..e17f50a847 100644 --- a/etc/supervisord.conf +++ b/conf/etc/supervisord.conf @@ -2,16 +2,16 @@ file=/tmp/supervisor.sock ; path to your socket file [supervisord] -logfile=tmp/supervisord.log ; supervisord log file +logfile=log/supervisord.log ; supervisord log file logfile_maxbytes=50MB ; maximum size of logfile before rotation logfile_backups=10 ; number of backed up logfiles loglevel=warn ; info, debug, warn, trace -pidfile=tmp/supervisord.pid ; pidfile location +pidfile=/tmp/supervisord.pid ; pidfile location nodaemon=false ; run supervisord as a daemon minfds=1024 ; number of startup file descriptors minprocs=200 ; number of process descriptors user=root ; default user -childlogdir=tmp +childlogdir=log [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface @@ -20,7 +20,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket [program:gogs] -command = /root/Developer/gopath/src/github.com/gogits/gogs/start.sh ; here must be the real url, not ~ or $GOROOT like +command = /root/Developer/gopath/src/github.com/gogits/gogs/start.sh ; here must be the real url, not ~ or $GOROOT like autostart = true -stdout_logfile = tmp/gogs-stderr.log -stderr_logfile = tmp/gogs-error.log
\ No newline at end of file +stdout_logfile = log/supervisor-gogs-stderr.log +stderr_logfile = log/supervisor-gogs-error.log
\ No newline at end of file diff --git a/gogs_supervisord.sh b/gogs_supervisord.sh index fb8b9b53a6..43908094b5 100644..100755 --- a/gogs_supervisord.sh +++ b/gogs_supervisord.sh @@ -1,7 +1,14 @@ #!/bin/sh -PID="tmp/supervisord.pid" -CONF="etc/supervisord.conf" +echo 'plase remember to modify the command path in etc/conf/supervisord.conf(line 23)' + +PID="/tmp/supervisord.pid" +CONF="conf/etc/supervisord.conf" + +LOGDIR="log" +if [ ! -d $LOGDIR ]; then + mkdir $LOGDIR +fi stop() { if [ -f $PID ]; then diff --git a/tmp/readme.txt b/tmp/readme.txt deleted file mode 100644 index 21984192e9..0000000000 --- a/tmp/readme.txt +++ /dev/null @@ -1 +0,0 @@ -here is log for supervisord and gogs
\ No newline at end of file |