add new nimo code

change more
2020-08-28 19:07:12 +08:00
parent eee4e30585
commit 5d50119825
30 changed files with 10540 additions and 110 deletions
--- a/supervisor_conf/.gitignore
+++ b/supervisor_conf/.gitignore
@@ -0,0 +1 @@
+conf.d
--- a/supervisor_conf/clear_log.sh
+++ b/supervisor_conf/clear_log.sh
@@ -0,0 +1,7 @@
+CURPATH=`pwd`
+BINPATH=$(dirname "$CURPATH")/bin
+find $BINPATH -type f -name 'log' -exec rm {} +
+
+
+
+
--- a/supervisor_conf/createln.sh
+++ b/supervisor_conf/createln.sh
@@ -1 +1,8 @@
-ln -sf `pwd`/*.conf /etc/supervisor/conf.d/
+
+CURPATH=`pwd`
+SUPPATH=$(dirname "$CURPATH")
+
+mkdir -p $CURPATH/conf.d
+cp *.conf $CURPATH/conf.d/
+sed -i "s#MYPATH#$SUPPATH#g" $CURPATH/conf.d/*.conf
+ln -sf $CURPATH/conf.d/*.conf /etc/supervisor/conf.d/
--- a/supervisor_conf/openrec_extractor.conf
+++ b/supervisor_conf/openrec_extractor.conf
@@ -2,9 +2,9 @@
 nodaemon=true

 [program:openrec_extractor]
-directory = /home/eson/test/intimate/bin/openrec_extractor/
-command= /home/eson/test/intimate/bin/openrec_extractor/openrec_extractor
+directory = MYPATH/bin/openrec_extractor/
+command= MYPATH/bin/openrec_extractor/openrec_extractor
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/openrec_extractor/log
+stderr_logfile=MYPATH/bin/openrec_extractor/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/openrec_task1.conf
+++ b/supervisor_conf/openrec_task1.conf
@@ -2,9 +2,9 @@
 nodaemon=true

 [program:openrec_ranking]
-directory = /home/eson/test/intimate/bin/openrec_task1
-command= /home/eson/test/intimate/bin/openrec_task1/openrec_task1
+directory = MYPATH/bin/openrec_task1
+command= MYPATH/bin/openrec_task1/openrec_task1
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/openrec_task1/log
+stderr_logfile=MYPATH/bin/openrec_task1/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/openrec_task2.conf
+++ b/supervisor_conf/openrec_task2.conf
@@ -2,11 +2,11 @@
 nodaemon=true

 [program:openrec_source]
-directory = /home/eson/test/intimate/bin/openrec_task2/
-command= /home/eson/test/intimate/bin/openrec_task2/openrec_task2
+directory = MYPATH/bin/openrec_task2/
+command= MYPATH/bin/openrec_task2/openrec_task2
 process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 numprocs=4                                                   ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/openrec_task2/log
+stderr_logfile=MYPATH/bin/openrec_task2/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/test.conf
+++ b/supervisor_conf/test.conf
@@ -1,12 +0,0 @@
-# [supervisord]
-# nodaemon=true
-
-# [program:openrec_extractor]
-# directory = /home/eson/test/intimate/extractor/openrec_extractor
-# command= /home/eson/test/intimate/extractor/openrec_extractor/openrec_extractor 
-# autorestart=true
-# # stdout_logfile=/home/eson/test/intimate/extractor/openrec/stdout
-# # stdout_logfile_maxbytes=0
-# stderr_logfile=/home/eson/test/intimate/extractor/openrec/log
-# stderr_logfile_maxbytes=0
-# stopsignal=QUIT
--- a/supervisor_conf/twitcasting_extractor.conf
+++ b/supervisor_conf/twitcasting_extractor.conf
@@ -3,12 +3,12 @@ nodaemon=false

 [program:twitcasting_extractor]
 environment=DISPLAY=":99"
-directory = /home/eson/test/intimate/bin/twitcasting_extractor/
-command= /home/eson/test/intimate/bin/twitcasting_extractor/twitcasting_extractor
+directory = MYPATH/bin/twitcasting_extractor/
+command= MYPATH/bin/twitcasting_extractor/twitcasting_extractor
 process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 numprocs=3                                                   ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/twitcasting_extractor/log
+stderr_logfile=MYPATH/bin/twitcasting_extractor/log
 # stderr_logfile=%(supervisorctl.var.directory)s/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/twitcasting_task1.conf
+++ b/supervisor_conf/twitcasting_task1.conf
@@ -3,11 +3,11 @@ nodaemon=false

 [program:twitcasting_task1]
 environment=DISPLAY=":99"
-directory = /home/eson/test/intimate/bin/twitcasting_task1/
-command= /home/eson/test/intimate/bin/twitcasting_task1/twitcasting_task1 
+directory = MYPATH/bin/twitcasting_task1/
+command= MYPATH/bin/twitcasting_task1/twitcasting_task1 
 # process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 # numprocs=1                                                   ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/twitcasting_task1/log
+stderr_logfile=MYPATH/bin/twitcasting_task1/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/twitch_extractor.conf
+++ b/supervisor_conf/twitch_extractor.conf
@@ -3,11 +3,11 @@ nodaemon=false

 [program:twitch_extractor]
 environment=DISPLAY=":99"
-directory = /home/eson/test/intimate/bin/twitch_extractor
-command= /home/eson/test/intimate/bin/twitch_extractor/twitch_extractor 
+directory = MYPATH/bin/twitch_extractor
+command= MYPATH/bin/twitch_extractor/twitch_extractor 
 process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 numprocs=5                                                  ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/twitch_extractor/log
+stderr_logfile=MYPATH/bin/twitch_extractor/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/twitch_extractor_p1.conf
+++ b/supervisor_conf/twitch_extractor_p1.conf
@@ -3,11 +3,11 @@ nodaemon=true

 [program:twitch_extractor_p1]
 environment=DISPLAY=":99",pac_proxy=http://localhost:1090/pac
-directory = /home/eson/test/intimate/bin/twitch_extractor
-command= /home/eson/test/intimate/bin/twitch_extractor/twitch_extractor 
+directory = MYPATH/bin/twitch_extractor
+command= MYPATH/bin/twitch_extractor/twitch_extractor 
 process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 numprocs=2                                                  ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/twitch_extractor/log
+stderr_logfile=MYPATH/bin/twitch_extractor/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/twitch_extractor_p2.conf
+++ b/supervisor_conf/twitch_extractor_p2.conf
@@ -3,11 +3,11 @@ nodaemon=false

 [program:twitch_extractor_p2]
 environment=DISPLAY=":99",pac_proxy=http://localhost:1090/pac1
-directory = /home/eson/test/intimate/bin/twitch_extractor
-command= /home/eson/test/intimate/bin/twitch_extractor/twitch_extractor 
+directory = MYPATH/bin/twitch_extractor
+command= MYPATH/bin/twitch_extractor/twitch_extractor 
 process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 numprocs=2                                                  ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/twitch_extractor/log
+stderr_logfile=MYPATH/bin/twitch_extractor/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/twitch_task2.conf
+++ b/supervisor_conf/twitch_task2.conf
@@ -3,11 +3,11 @@ nodaemon=false

 [program:twitch_task2]
 environment=DISPLAY=":99"
-directory = /home/eson/test/intimate/bin/twitch_task2
-command= /home/eson/test/intimate/bin/twitch_task2/twitch_task2 
+directory = MYPATH/bin/twitch_task2
+command= MYPATH/bin/twitch_task2/twitch_task2 
 process_name=%(program_name)s_%(process_num)02d              ;多进程名称
 numprocs=6                                                   ;启动多个进程
 autorestart=true
-stderr_logfile=/home/eson/test/intimate/bin/twitch_task2/log
+stderr_logfile=MYPATH/bin/twitch_task2/log
 stderr_logfile_maxbytes=0
 stopsignal=QUIT
--- a/supervisor_conf/xvfb.conf
+++ b/supervisor_conf/xvfb.conf
@@ -3,11 +3,6 @@
 nodaemon=true

 [program:xvfb-99]
-# directory = /home/eson/test/intimate/extractor/openrec_extractor
 command=/usr/bin/Xvfb :99 -screen 0 1280x720x24 -ac -nolisten tcp -dpi 96 +extension RANDR -nolisten tcp
 autorestart=true
-# # stdout_logfile=/home/eson/test/intimate/extractor/openrec/stdout
-# # stdout_logfile_maxbytes=0
-# stderr_logfile=/home/eson/test/intimate/extractor/openrec/log
-# stderr_logfile_maxbytes=0
-# stopsignal=QUIT
+