Use "web_extra_daemons" (#11)

* Use "web_extra_daemons"
Fixes #10

* clear up install file

* Update README

* Add DDEV constraint

Co-authored-by: Randy Fay <[email protected]>

* Handle "queue exiting doesn't end up with no runner"

Co-authored-by: Randy Fay <[email protected]>

* try different "while" loop

* disable "install from release", temporarily

* Remove older files

* hide grep "post-install" message

---------

Co-authored-by: tyler36 <[email protected]>
Co-authored-by: Randy Fay <[email protected]>

Author: tyler36

README.md

@@ -24,9 +24,6 @@ ddev restart
 ## What does this add-on do and add?
 
 1. Checks to make sure the DDEV version is adequate.
-2. Adds `.ddev/web-build/laravel-worker.conf`, which configures the queue worker.
-3. Adds `.ddev/web-build/Dockerfile.ddev-laravel-worker`, which adds the worker to supervisor.
-
- See [Configuring Supervisor](https://laravel.com/docs/master/queues#configuring-supervisor) for the latest recommended settings.
+2. Adds `.ddev/config.laravel-workers.yaml`, which starts the queue worker daemon.
 
 **Contributed and maintained by [tyler36](https://github.com/tyler36)**

config.laravel-workers.yaml

@@ -0,0 +1,7 @@
+#ddev-generated
+
+ddev_version_constraint: '>=v1.23.0'
+web_extra_daemons:
+  - name: "queue-1"
+    command: 'while true; do /usr/bin/php /var/www/html/artisan queue:work --sleep=3 --tries=3; sleep 1; done'
+    directory: /var/www/html

install.yaml

@@ -1,21 +1,10 @@
 name: ddev-laravel-queue
 
-# pre_install_actions - list of actions to run before installing the addon.
-# Examples would be removing an extraneous docker volume,
-# or doing a sanity check for requirements.
-pre_install_actions:
-# - 'if [ "$(arch)" = "arm64" -o "$(arch)" = "aarch64" ]; then echo "This package does not work on arm64 machines"; exit 1; fi'
-# - "docker volume rm ddev-${DDEV_PROJECT}_solr 2>/dev/null || true"
-
 # list of files and directories listed that are copied into project .ddev directory
 project_files:
-- web-build/Dockerfile.ddev-laravel-worker
-- web-build/laravel-worker.conf
-
-
-# List of files and directories that are copied into the global .ddev directory
-global_files:
-
+- config.laravel-workers.yaml
 
 post_install_actions:
-
+# - echo 'Check if there are any < 1.0 release files and remove them.'
+- if grep "#ddev-generated" web-build/Dockerfile.ddev-laravel-worker 2>/dev/null; then rm web-build/Dockerfile.ddev-laravel-worker; fi
+- if grep "#ddev-generated" web-build/laravel-worker.conf 2>/dev/null; then rm web-build/laravel-worker.conf; fi

tests/test.bats

@@ -49,16 +49,16 @@ teardown() {
   health_checks
 }
 
-@test "install from release" {
-  set -eu -o pipefail
-  cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
-  echo "# ddev get tyler36/ddev-laravel-worker with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
-  ddev config --project-name=${PROJNAME}
-  ddev start -y >/dev/null
-  ddev get tyler36/ddev-laravel-worker
-  ddev restart >/dev/null
-  health_checks
-}
+# @test "install from release" {
+#   set -eu -o pipefail
+#   cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
+#   echo "# ddev get tyler36/ddev-laravel-worker with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
+#   ddev config --project-name=${PROJNAME}
+#   ddev start -y >/dev/null
+#   ddev get tyler36/ddev-laravel-worker
+#   ddev restart >/dev/null
+#   health_checks
+# }
 
 @test "it processes jobs in Lavarel 11" {
   set -eu -o pipefail
@@ -75,3 +75,37 @@ teardown() {
   health_checks
   queue_checks
 }
+
+@test "it cleans up files from pre-release versions" {
+  set -eu -o pipefail
+  cd ${TESTDIR}
+  # echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
+  ddev config --project-name=${PROJNAME}
+  ddev start -y >/dev/null
+
+  # Create fake pre-release files
+  files="
+  .ddev/web-build/Dockerfile.ddev-laravel-worker
+  .ddev/web-build/laravel-worker.conf
+  "
+  for file in $files; do
+    echo '#ddev-generated' > $file
+    if grep -q -v '#ddev-generated' $file; then
+      echo 'Fake prelease file should exist but does NOT.'
+      exit 1
+    fi
+  done
+
+  # Install the current release of the addon, which should remove the pre-release files.
+  ddev get ${DIR}
+  ddev restart
+  health_checks
+
+  # Check pre-release files were removed
+  for file in $files; do
+    if grep -q '#ddev-generated' $file; then
+      echo 'Fake prelease file exists but should NOT.'
+      exit 1
+    fi
+  done
+}