From b4c4825c2ab545b89148eae6c2e2fed3420eeab5 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:30:59 -0500 Subject: [PATCH 01/13] Remove `redis-server` from Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c54bf9c8..7376bbb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -276,7 +276,6 @@ RUN --mount=type=cache,id=apt-lib-cache,sharing=locked,target=/var/lib/apt \ pkgconf \ python3 \ python3-wheel \ - redis-server \ curl \ less \ && \ From 0e4c5b10c95f2fe628770e805fc21b29f4d4ce37 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:32:26 -0500 Subject: [PATCH 02/13] Delete config/root/etc/redis/redis.conf --- config/root/etc/redis/redis.conf | 46 -------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 config/root/etc/redis/redis.conf diff --git a/config/root/etc/redis/redis.conf b/config/root/etc/redis/redis.conf deleted file mode 100644 index 8e411e80..00000000 --- a/config/root/etc/redis/redis.conf +++ /dev/null @@ -1,46 +0,0 @@ -bind 127.0.0.1 -protected-mode yes -port 6379 -tcp-backlog 511 -timeout 0 -tcp-keepalive 300 -daemonize no -supervised no -loglevel notice -logfile "" -databases 1 -always-show-logo no -save "" -dir /var/lib/redis -maxmemory 64mb -maxmemory-policy noeviction -lazyfree-lazy-eviction no -lazyfree-lazy-expire no -lazyfree-lazy-server-del no -replica-lazy-flush no -lazyfree-lazy-user-del no -oom-score-adj no -oom-score-adj-values 0 200 800 -appendonly no -appendfsync no -lua-time-limit 5000 -slowlog-log-slower-than 10000 -slowlog-max-len 128 -latency-monitor-threshold 0 -notify-keyspace-events "" -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 -list-max-ziplist-size -2 -list-compress-depth 0 -set-max-intset-entries 512 -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 -hll-sparse-max-bytes 3000 -stream-node-max-bytes 4096 -stream-node-max-entries 100 -activerehashing yes -client-output-buffer-limit normal 0 0 0 -client-output-buffer-limit replica 256mb 64mb 60 -client-output-buffer-limit pubsub 32mb 8mb 60 -hz 10 -dynamic-hz yes From 44910edbb17f31d5e58f9bb7cf2fa687af05f579 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:33:00 -0500 Subject: [PATCH 03/13] Delete config/root/etc/s6-overlay/s6-rc.d/redis/run --- config/root/etc/s6-overlay/s6-rc.d/redis/run | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 config/root/etc/s6-overlay/s6-rc.d/redis/run diff --git a/config/root/etc/s6-overlay/s6-rc.d/redis/run b/config/root/etc/s6-overlay/s6-rc.d/redis/run deleted file mode 100755 index 09edec81..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/redis/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/command/with-contenv bash - -exec s6-setuidgid redis \ - /usr/bin/redis-server /etc/redis/redis.conf From e0b98f34b7ac7bb61b3552179ebdd6d0bfe7cf64 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:33:14 -0500 Subject: [PATCH 04/13] Delete config/root/etc/s6-overlay/s6-rc.d/redis/dependencies --- config/root/etc/s6-overlay/s6-rc.d/redis/dependencies | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 config/root/etc/s6-overlay/s6-rc.d/redis/dependencies diff --git a/config/root/etc/s6-overlay/s6-rc.d/redis/dependencies b/config/root/etc/s6-overlay/s6-rc.d/redis/dependencies deleted file mode 100644 index e69de29b..00000000 From bd5dbbd295c781ab269aa94fb332e5ef086afa87 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:33:28 -0500 Subject: [PATCH 05/13] Delete config/root/etc/s6-overlay/s6-rc.d/redis/type --- config/root/etc/s6-overlay/s6-rc.d/redis/type | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/root/etc/s6-overlay/s6-rc.d/redis/type diff --git a/config/root/etc/s6-overlay/s6-rc.d/redis/type b/config/root/etc/s6-overlay/s6-rc.d/redis/type deleted file mode 100644 index 1780f9f4..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/redis/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file From 170671d4ec38faf66c3b33277cd30bd1d0c4db14 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:37:25 -0500 Subject: [PATCH 06/13] Delete config/root/etc/s6-overlay/s6-rc.d/celery-worker/dependencies --- config/root/etc/s6-overlay/s6-rc.d/celery-worker/dependencies | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/root/etc/s6-overlay/s6-rc.d/celery-worker/dependencies diff --git a/config/root/etc/s6-overlay/s6-rc.d/celery-worker/dependencies b/config/root/etc/s6-overlay/s6-rc.d/celery-worker/dependencies deleted file mode 100644 index 283e1305..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/celery-worker/dependencies +++ /dev/null @@ -1 +0,0 @@ -gunicorn \ No newline at end of file From 1ba97749df5776bf1f0602f46fb995ba3540574a Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:37:37 -0500 Subject: [PATCH 07/13] Delete config/root/etc/s6-overlay/s6-rc.d/celery-worker/run --- .../etc/s6-overlay/s6-rc.d/celery-worker/run | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100755 config/root/etc/s6-overlay/s6-rc.d/celery-worker/run diff --git a/config/root/etc/s6-overlay/s6-rc.d/celery-worker/run b/config/root/etc/s6-overlay/s6-rc.d/celery-worker/run deleted file mode 100755 index 04e2a32c..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/celery-worker/run +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/with-contenv bash - -UMASK_SET=${UMASK_SET:-022} -umask "$UMASK_SET" - -cd /app || exit - -PIDFILE=/run/app/celery-worker.pid - -if [ -f "${PIDFILE}" ] -then - PID=$(cat $PIDFILE) - echo "Unexpected PID file exists at ${PIDFILE} with PID: ${PID}" - if kill -0 $PID - then - echo "Killing old gunicorn process with PID: ${PID}" - kill -9 $PID - fi - echo "Removing stale PID file: ${PIDFILE}" - rm ${PIDFILE} -fi - -#exec s6-setuidgid app \ -# /usr/local/bin/celery --workdir /app -A tubesync worker --pidfile ${PIDFILE} -l INFO From 3d1cc110ace3625f50ee7d5a3e022a97fad90af0 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:37:46 -0500 Subject: [PATCH 08/13] Delete config/root/etc/s6-overlay/s6-rc.d/celery-worker/type --- config/root/etc/s6-overlay/s6-rc.d/celery-worker/type | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/root/etc/s6-overlay/s6-rc.d/celery-worker/type diff --git a/config/root/etc/s6-overlay/s6-rc.d/celery-worker/type b/config/root/etc/s6-overlay/s6-rc.d/celery-worker/type deleted file mode 100644 index 1780f9f4..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/celery-worker/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file From b474e9e817a2ae46b69f5242d24d2975ace7b060 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:38:45 -0500 Subject: [PATCH 09/13] Delete config/root/etc/s6-overlay/s6-rc.d/celery-beat/run --- .../etc/s6-overlay/s6-rc.d/celery-beat/run | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100755 config/root/etc/s6-overlay/s6-rc.d/celery-beat/run diff --git a/config/root/etc/s6-overlay/s6-rc.d/celery-beat/run b/config/root/etc/s6-overlay/s6-rc.d/celery-beat/run deleted file mode 100755 index 46b03a67..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/celery-beat/run +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/with-contenv bash - -UMASK_SET=${UMASK_SET:-022} -umask "$UMASK_SET" - -cd /app || exit - -PIDFILE=/run/app/celery-beat.pid -SCHEDULE=/tmp/tubesync-celerybeat-schedule - -if [ -f "${PIDFILE}" ] -then - PID=$(cat $PIDFILE) - echo "Unexpected PID file exists at ${PIDFILE} with PID: ${PID}" - if kill -0 $PID - then - echo "Killing old gunicorn process with PID: ${PID}" - kill -9 $PID - fi - echo "Removing stale PID file: ${PIDFILE}" - rm ${PIDFILE} -fi - -#exec s6-setuidgid app \ -# /usr/local/bin/celery --workdir /app -A tubesync beat --pidfile ${PIDFILE} -s ${SCHEDULE} From 3f93d0ae34f572b1f8c8cae16ab9bf3d5077846c Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:38:53 -0500 Subject: [PATCH 10/13] Delete config/root/etc/s6-overlay/s6-rc.d/celery-beat/dependencies --- config/root/etc/s6-overlay/s6-rc.d/celery-beat/dependencies | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/root/etc/s6-overlay/s6-rc.d/celery-beat/dependencies diff --git a/config/root/etc/s6-overlay/s6-rc.d/celery-beat/dependencies b/config/root/etc/s6-overlay/s6-rc.d/celery-beat/dependencies deleted file mode 100644 index 283e1305..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/celery-beat/dependencies +++ /dev/null @@ -1 +0,0 @@ -gunicorn \ No newline at end of file From a111da9104dbe296a584ef2139f55e9aeab6bfeb Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:39:04 -0500 Subject: [PATCH 11/13] Delete config/root/etc/s6-overlay/s6-rc.d/celery-beat/type --- config/root/etc/s6-overlay/s6-rc.d/celery-beat/type | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/root/etc/s6-overlay/s6-rc.d/celery-beat/type diff --git a/config/root/etc/s6-overlay/s6-rc.d/celery-beat/type b/config/root/etc/s6-overlay/s6-rc.d/celery-beat/type deleted file mode 100644 index 1780f9f4..00000000 --- a/config/root/etc/s6-overlay/s6-rc.d/celery-beat/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file From 2f044c36142e9b736af3e386fa32575e6086c241 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:54:53 -0500 Subject: [PATCH 12/13] Remove `hiredis` & `redis` from Pipfile --- Pipfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Pipfile b/Pipfile index 00389093..61d66a04 100644 --- a/Pipfile +++ b/Pipfile @@ -20,7 +20,5 @@ django-basicauth = "*" psycopg2-binary = "*" mysqlclient = "*" yt-dlp = "*" -redis = "*" -hiredis = "*" requests = {extras = ["socks"], version = "*"} emoji = "*" From 822db9d0395599a77c30e820a28899374fc16077 Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 24 Feb 2025 04:58:56 -0500 Subject: [PATCH 13/13] Delete tubesync/tubesync/celery.py --- tubesync/tubesync/celery.py | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 tubesync/tubesync/celery.py diff --git a/tubesync/tubesync/celery.py b/tubesync/tubesync/celery.py deleted file mode 100644 index aad3092f..00000000 --- a/tubesync/tubesync/celery.py +++ /dev/null @@ -1,19 +0,0 @@ -import os -from celery import Celery - - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tubesync.settings') -REDIS_CONNECTION = os.getenv('REDIS_CONNECTION', 'redis://localhost:6379/0') - - -app = Celery('tubesync') -app.config_from_object('django.conf:settings', namespace='CELERY') -app.autodiscover_tasks() -app.conf.broker_url = REDIS_CONNECTION -app.conf.beat_schedule = { - '10-second-beat': { - 'task': 'sync.tasks.housekeeping_task', - 'schedule': 60.0, - 'args': () - }, -}