Hotfix/add missing worker

.docker/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7.3
+FROM python:3.6
 
 RUN apt-get -y update && apt-get -y upgrade &&  apt-get install -y ffmpeg
 

.docker/scheduler/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7.3
+FROM python:3.6
 
 RUN apt-get -y update && apt-get -y upgrade &&  apt-get install -y ffmpeg  && apt-get install -y supervisor
 
@@ -21,4 +21,4 @@ RUN pip install -r requirements.txt
 
 VOLUME ["/opt/okuna-api"]
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

.docker/scheduler/supervisord.conf

@@ -49,4 +49,18 @@ startretries = 3                ; max # of serial start failures (default 3)
 exitcodes = 0, 2                 ; 'expected' exit codes for process (default 0, 2)
 killasgroup = true              ; SIGKILL the UNIX process group (def false)
 stopasgroup = true
+stopsignal = QUIT
+
+[program: rqscheduleractivityscore]
+command = python manage.py rqscheduler --queue=process-activity-score
+loglevel = info                ; (log level;default info; others: debug, warn, trace)
+numprocs = 1
+directory = /opt/okuna-api
+autostart = true
+autorestart = unexpected
+startsecs = 1                   ; number of secs prog must stay running (def. 1)
+startretries = 3                ; max # of serial start failures (default 3)
+exitcodes = 0, 2                 ; 'expected' exit codes for process (default 0, 2)
+killasgroup = true              ; SIGKILL the UNIX process group (def false)
+stopasgroup = true
 stopsignal = QUIT

.docker/worker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7.3
+FROM python:3.6
 
 RUN apt-get -y update && apt-get -y upgrade &&  apt-get install -y ffmpeg  && apt-get install -y supervisor
 
@@ -21,4 +21,4 @@ RUN pip install -r /requirements.txt
 
 VOLUME ["/opt/okuna-api"]
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

.docker/worker/supervisord.conf

@@ -49,4 +49,18 @@ startretries = 3                ; max # of serial start failures (default 3)
 exitcodes = 0, 2                 ; 'expected' exit codes for process (default 0, 2)
 killasgroup = true              ; SIGKILL the UNIX process group (def false)
 stopasgroup = true
+stopsignal = QUIT
+
+[program: rqworkeractivityscore]
+command = python manage.py rqworker process-activity-score
+loglevel = info                ; (log level;default info; others: debug, warn, trace)
+numprocs = 1
+directory = /opt/okuna-api
+autostart = true
+autorestart = unexpected
+startsecs = 1                   ; number of secs prog must stay running (def. 1)
+startretries = 3                ; max # of serial start failures (default 3)
+exitcodes = 0, 2                 ; 'expected' exit codes for process (default 0, 2)
+killasgroup = true              ; SIGKILL the UNIX process group (def false)
+stopasgroup = true
 stopsignal = QUIT

.ebextensions/supervisord.config

@@ -8,7 +8,7 @@ files:
             file=/opt/python/run/supervisor.sock   ; (the path to the socket file)
             ;chmod=0700                 ; socket file mode (default 0700)
             ;chown=nobody:nogroup       ; socket file uid:gid owner
-            
+
             [supervisord]
             logfile=/opt/python/log/supervisord.log ; (main log file;default $CWD/supervisord.log)
             logfile_maxbytes=10MB        ; (max main logfile bytes b4 rotation;default 50MB)
@@ -19,13 +19,13 @@ files:
             minprocs=200                 ; (min. avail process descriptors;default 200)
             directory=/opt/python/current/app    ; (default is not to cd during start)
             ;nocleanup=true              ; (don not clean up tempfiles at start;default false)
-            
+
             [rpcinterface:supervisor]
             supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-            
+
             [supervisorctl]
             serverurl=unix:///opt/python/run/supervisor.sock
-            
+
             [program:httpd]
             command=/opt/python/bin/httpdlaunch
             stdout_logfile=/opt/python/log/django_stdout.log
@@ -39,8 +39,8 @@ files:
             exitcodes=0,2                 ; 'expected' exit codes for process (default 0,2)
             killasgroup=false             ; SIGKILL the UNIX process group (def false)
             redirect_stderr=false
-            
-            
+
+
             [program:rqworkerdefault]
             command=/bin/bash -c 'source /opt/python/current/env && source /opt/python/run/venv/bin/activate && python manage.py rqworker default'
             stdout_logfile=/opt/python/log/rqworkerdefault_stdout.log
@@ -61,7 +61,7 @@ files:
             stopasgroup=true
             stopsignal=QUIT
             redirect_stderr=false
-            
+
             [program:rqworkerhigh]
             command=/bin/bash -c 'source /opt/python/current/env && source /opt/python/run/venv/bin/activate && python manage.py rqworker high'
             stdout_logfile=/opt/python/log/rqworkerhigh_stdout.log
@@ -81,7 +81,7 @@ files:
             stopasgroup=true
             stopsignal=QUIT
             redirect_stderr=false
-            
+
             [program:rqworkerlow]
             command=/bin/bash -c 'source /opt/python/current/env && source /opt/python/run/venv/bin/activate && python manage.py rqworker low'
             stdout_logfile=/opt/python/log/rqworkerlow_stdout.log
@@ -101,3 +101,23 @@ files:
             stopasgroup=true
             stopsignal=QUIT
             redirect_stderr=false
+
+            [program:rqworkeractivityscore]
+            command=/bin/bash -c 'source /opt/python/current/env && source /opt/python/run/venv/bin/activate && python manage.py rqworker process-activity-score'
+            stdout_logfile=/opt/python/log/rqworkerlow_stdout.log
+            stderr_logfile=/opt/python/log/rqworkerlow_stderr.log
+            pidfile=/opt/python/run/rqworker_low
+            loglevel=info                ; (log level;default info; others: debug,warn,trace)
+            user=nobody
+            group=nobody
+            numprocs=1
+            directory=/opt/python/current/app
+            autostart=true
+            autorestart=unexpected
+            startsecs=1                   ; number of secs prog must stay running (def. 1)
+            startretries=3                ; max # of serial start failures (default 3)
+            exitcodes=0,2                 ; 'expected' exit codes for process (default 0,2)
+            killasgroup=true              ; SIGKILL the UNIX process group (def false)
+            stopasgroup=true
+            stopsignal=QUIT
+            redirect_stderr=false

CHANGELOG.md

@@ -4,10 +4,17 @@ The change log for the API server for Okuna.
 
 ## Table of contents
 
+- [Release 0.0.66](#release-0.0.66)
 - [Release 0.0.63](#release-0.0.63)
 - [Release 0.0.59](#release-0.0.59)
 
 
+## Release 0.0.66
+
+- Introduce activity score in posts and communities, add jobs for the same
+- Refactor trending posts and trending communities to use activity score
+
+
 ## Release 0.0.63
 
 - Improve performance for linked users API

Pipfile

@@ -55,6 +55,7 @@ shutilwhich = "*"
 halo = "*"
 watchdog = "*"
 spectra = "*"
+colorlog = "*"
 
 [pipenv]
 allow_prereleases = true