Skip to content

Commit b343ced

Browse files
author
Bernhard B
committed
a few small changes (mostly code cleanup + a little bit of refactoring)
1 parent 586aad3 commit b343ced

File tree

6 files changed

+34
-32
lines changed

6 files changed

+34
-32
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[program:imagemonkey-playground-api]
2+
process_name=imagemonkey-playground-api%(process_num)s
3+
command=/home/playground/bin/playground-api -release -predictions_dir=/tmp/predictions/ -donations_dir=/home/playground/donations/ -cors_allow_origin=https://imagemonkey.io -use_sentry
4+
autostart=true
5+
autorestart=true
6+
startretries=10
7+
user=playground
8+
directory=/home/playground/bin/
9+
redirect_stderr=true
10+
stdout_logfile=/var/log/imagemonkey-playground-api/out-%(process_num)s.log
11+
stderr_logfile=/var/log/imagemonkey-playground-api/err-%(process_num)s.log
12+
stdout_logfile_maxbytes=50MB
13+
stdout_logfile_backups=10
14+
numprocs=1

conf/supervisor/imagemonkey-playground-grabcut.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[program:imagemonkey-playground-grabcut]
22
process_name=imagemonkey-playground-grabcut%(process_num)s
3-
command=python2.7 /home/playground/bin/grabcut.py
3+
command=python3 /home/playground/bin/grabcut.py --use_sentry true --maintenance_file /home/imagemonkey/maintenance.tmp
44
autostart=true
55
autorestart=true
66
startretries=10
@@ -11,4 +11,4 @@ stdout_logfile=/var/log/imagemonkey-playground-grabcut/out-%(process_num)s.log
1111
stderr_logfile=/var/log/imagemonkey-playground-grabcut/err-%(process_num)s.log
1212
stdout_logfile_maxbytes=50MB
1313
stdout_logfile_backups=10
14-
numprocs=5
14+
numprocs=5
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[program:imagemonkey-playground-predict]
2+
process_name=imagemonkey-playground-predict%(process_num)s
3+
command=/home/playground/bin/predict -use_sentry
4+
autostart=true
5+
autorestart=true
6+
startretries=10
7+
user=playground
8+
directory=/home/playground/bin/
9+
redirect_stderr=true
10+
stdout_logfile=/var/log/imagemonkey-playground-predict/out-%(process_num)s.log
11+
stderr_logfile=/var/log/imagemonkey-playground-predict/err-%(process_num)s.log
12+
stdout_logfile_maxbytes=50MB
13+
stdout_logfile_backups=10
14+
numprocs=1

conf/supervisor/imagemonkey-playground-web.conf

Lines changed: 0 additions & 14 deletions
This file was deleted.

conf/supervisor/imagemonkey-playground.conf

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/predict/predict.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ func main() {
260260
maxWorkers := flag.Int("max-workers", 5, "The number of workers to start")
261261
maxWorkersNSFW := flag.Int("max-workers-nsfw", 3, "The number of workers that operate on the NSFW model")
262262
useSentry := flag.Bool("use_sentry", false, "Use Sentry for error logging")
263+
modelsDir := flag.String("models-dir", "/home/playground/training/models/", "Models Directory")
264+
nsfwModelsDir := flag.String("nsfw-models-dir", "/home/playground/training/models/nsfw/", "NSFW Models Directory")
263265

264266
flag.Parse()
265267

@@ -288,12 +290,12 @@ func main() {
288290
log.Debug("Starting Dispatcher")
289291

290292
jobQueue := make(chan Job, *maxWorkerQueueSize)
291-
dispatcher := NewDispatcher(jobQueue, *maxWorkers, "/home/playground/training/models/")
293+
dispatcher := NewDispatcher(jobQueue, *maxWorkers, *modelsDir)
292294
dispatcher.run()
293295

294296
//NSFW job queue
295297
nsfwJobQueue := make(chan Job, *maxWorkerQueueSize)
296-
nsfwDispatcher := NewDispatcher(nsfwJobQueue, *maxWorkersNSFW, "/home/playground/training/models/nsfw/")
298+
nsfwDispatcher := NewDispatcher(nsfwJobQueue, *maxWorkersNSFW, *nsfwModelsDir)
297299
nsfwDispatcher.run()
298300

299301
for {

0 commit comments

Comments
 (0)