Ruby 3.2

.ebextensions/cronjob.config

@@ -1,264 +1,130 @@
 files:
-    #
-    # Check for DCC meters
-    #
-    "/etc/cron.d/dcc-check":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            00 1 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake meters:check_for_dcc >> /var/log/jobs.log 2>&1'
-
-    #
-    # Load non-amr data feeds
-    #
-    "/etc/cron.d/carbon-intensity":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            00 3 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake data_feeds:carbon_intensity_loader >> /var/log/jobs.log 2>&1'
-
-    "/etc/cron.d/load-solar-pv-tuos":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            30 3,15 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake data_feeds:solar_pv_tuos_loader >> /var/log/jobs.log 2>&1'
-
-    "/etc/cron.d/load-meteostat-data":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            50 3 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake data_feeds:meteostat_loader >> /var/log/jobs.log 2>&1'
-
-    "/etc/cron.d/back-fill-any-meteostat-temperatures":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            55 3 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake data_feeds:meteostat_back_fill >> /var/log/jobs.log 2>&1'
-
-    "/etc/cron.d/back-fill-any-solar-pv-readings":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            35 3 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake data_feeds:solar_pv_tuos_back_fill >> /var/log/jobs.log 2>&1'
-
-    #
-    # Import CSV files
-    #
-    "/etc/cron.d/import-csv-files":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            15 5 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake amr:import_all >> /var/log/jobs.log 2>&1'
-
-    "/etc/cron.d/import-rtone-variant-data":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            20 4 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake solar:import_rtone_variant_readings >> /var/log/jobs.log 2>&1'
-
-    #
-    # Import Solar Edge data
-    #
-    "/etc/cron.d/import-solar-edge-data":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            15 4 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake solar:import_solar_edge_readings >> /var/log/jobs.log 2>&1'
-
-    #
-    # Import Low carbon hub data
-    #
-    "/etc/cron.d/import-low-carbon-hub-data":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            05 5 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake solar:import_low_carbon_hub_readings >> /var/log/jobs.log 2>&1'
-
-    #
-    # Import n3rgy readings
-    #
-    "/etc/cron.d/import-n3rgy-readings":
-      mode: "000644"
-      owner: root
-      group: root
-      content: |
-        0 14 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake amr:import_n3rgy_readings >> /var/log/jobs.log 2>&1'
-
-    "/etc/cron.d/import_n3rgy_tariffs":
-      mode: "000644"
-      owner: root
-      group: root
-      content: |
-        10 14 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake amr:import_n3rgy_tariffs >> /var/log/jobs.log 2>&1'
-
-    #
-    # Start daily regeneration jobs
-    #
-    "/etc/cron.d/daily-regeneration":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            00 6 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake school:daily_regeneration >> /var/log/jobs.log 2>&1'
-
-    #
-    # Generate subscriptions
-    #
-    "/etc/cron.d/generate-subscriptions":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            30 6 * * Wed root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake alerts:generate_subscriptions >> /var/log/jobs.log 2>&1'
-    #
-    # EMail summary of imports
-    #
-    "/etc/cron.d/notify-amr-imports-daily":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            45 9 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake amr_importer:send_daily_notification_email >> /var/log/jobs.log 2>&1'
-
-    #
-    # EMail summary of Rollbar errors from imports
-    #
-    #"/etc/cron.d/rollbar-reports-daily":
-    #    mode: "000644"
-    #    owner: root
-    #    group: root
-    #    content: |
-    #        0 9 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake utility:custom_rollbar_reports >> /var/log/jobs.log 2>&1'
-
-    #
-    # Generate sitemap
-    #
-    "/etc/cron.d/generate-sitemap-daily":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            00 1 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake "-s sitemap:refresh" >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send first target emails weekly on a Monday
-    #
-    "/etc/cron.d/send-first-target-emails":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          30 08 * * 1 root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake targets:send_first_target >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send email with recently recorded activities weekly on a Monday
-    #
-    "/etc/cron.d/send-recent-activities-email":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          32 08 * * 1 root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake recent_activities:send_email >> /var/log/jobs.log 2>&1'
-
-
-    #
-    # Send weekly email about target progress to admins
-    #
-    "/etc/cron.d/send-weekly-admin-target-reports":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          30 08 * * 5 root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake targets:admin_report >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send issues report to admins weekly on a Monday
-    #
-    "/etc/cron.d/send-weekly-admin-issue-reports":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          15 08 * * 1 root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake issues:send_user_report >> /var/log/jobs.log 2>&1'
-
-    #
-    # Resync translations with Transifex on Monday mornings
-    #
-    "/etc/cron.d/sync-transifex-data":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          00 08 * * 1 root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake i18n:transifex_load >> /var/log/jobs.log 2>&1'
-
-
-    #
-    # Delete old alert content
-    #
-    "/etc/cron.d/delete_alert_content":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          0 0 1 * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake alerts:delete_alert_content >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send Good Job queue metrics to AWS Cloudwatch
-    #
-    "/etc/cron.d/send-good-job-queue-metrics-to-cloudwatch":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          */5 * * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake jobs:send_good_job_queue_metrics_to_cloudwatch >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send Review Group Tariffs Reminders
-    #
-    "/etc/cron.d/send_review_group_tariffs_reminders":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          0 8 15 3,9 * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake school_groups:send_review_group_tariffs_reminder >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send Review School Tariffs Reminders
-    #
-    "/etc/cron.d/send_review_school_tariffs_reminders":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-          0 8 15 3,9 * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake schools:send_review_school_tariffs_reminder >> /var/log/jobs.log 2>&1'
-
-    #
-    # Send Onboarding Reminder Emails
-    #
-    "/etc/cron.d/send-daily-onboarding-reminder-emails":
-        mode: "000644"
-        owner: root
-        group: root
-        content: |
-            00 4 * * * root /bin/bash -l -c 'cd /var/app/current && RAILS_ENV=production bin/run_as_webapp bundle exec rake onboarding:reminder_mailer >> /var/log/jobs.log 2>&1'
+    /usr/local/sbin/run-webapp-job:
+        mode: "000755"
+        owner: root
+        group: root
+        content: |
+            #!/bin/bash
+            exec >>/var/log/jobs.log 2>&1
+            echo "## Running "$@" at $(date --iso-8601=seconds)"
+            if [ -f /disable_jobs ]; then
+                echo "disabled by file /disable_jobs"
+                exit 0
+            fi
+            run-as-webapp bin/rake "$@"
+
+    /usr/local/sbin/run-as-webapp:
+        mode: "000755"
+        owner: root
+        group: root
+        content: |
+            #!/bin/bash
+            set -e
+            [ "$EUID" -ne 0 ] && echo "Run as root" 1>&2 && exit 1
+            EB_APP_DIR="$(/opt/elasticbeanstalk/bin/get-config platformconfig -k AppDeployDir)"
+            EB_APP_USER="$(/opt/elasticbeanstalk/bin/get-config platformconfig -k AppUser)"
+            cd "$EB_APP_DIR"
+            export $(< /opt/elasticbeanstalk/deployment/env)
+            runuser -u "$EB_APP_USER" -- "$@"
+
+    /etc/cron.d/energysparks:
+        mode: "000644"
+        owner: root
+        group: root
+        content: |
+            PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
+            #
+            # Check for DCC meters
+            #
+            0 1 * * * root run-webapp-job meters:check_for_dcc
+            #
+            # Load non-amr data feeds
+            #
+            0 3 * * * root run-webapp-job data_feeds:carbon_intensity_loader
+            30 3,15 * * * root run-webapp-job data_feeds:solar_pv_tuos_loader
+            50 3 * * * root run-webapp-job data_feeds:meteostat_loader
+            55 3 * * * root run-webapp-job data_feeds:meteostat_back_fill
+            35 3 * * * root run-webapp-job data_feeds:solar_pv_tuos_back_fill
+            #
+            # Import CSV files
+            #
+            15 5 * * * root run-webapp-job amr:import_all
+            20 4 * * * root run-webapp-job solar:import_rtone_variant_readings
+            #
+            # Import Solar Edge data
+            #
+            15 4 * * * root run-webapp-job solar:import_solar_edge_readings
+            #
+            # Import Low carbon hub data
+            #
+            5 5 * * * root run-webapp-job solar:import_low_carbon_hub_readings
+            #
+            # Import n3rgy readings
+            #
+            0 14 * * * root run-webapp-job amr:import_n3rgy_readings
+            10 14 * * * root run-webapp-job amr:import_n3rgy_tariffs
+            #
+            # Start daily regeneration jobs
+            #
+            0 6 * * * root run-webapp-job school:daily_regeneration
+            #
+            # Generate subscriptions
+            #
+            30 6 * * Wed root run-webapp-job alerts:generate_subscriptions
+            #
+            # EMail summary of imports
+            #
+            45 9 * * * root run-webapp-job amr_importer:send_daily_notification_email
+            #
+            # EMail summary of Rollbar errors from imports
+            #
+            # 0 9 * * * root run-webapp-job utility:custom_rollbar_reports
+            #
+            # Generate sitemap
+            #
+            0 1 * * * root run-webapp-job -s sitemap:refresh
+            #
+            # Send first target emails weekly on a Monday
+            #
+            30 08 * * 1 root run-webapp-job targets:send_first_target
+            #
+            # Send email with recently recorded activities weekly on a Monday
+            #
+            32 08 * * 1 root run-webapp-job recent_activities:send_email
+            #
+            # Send weekly email about target progress to admins
+            #
+            30 08 * * 5 root run-webapp-job targets:admin_report
+            #
+            # Send issues report to admins weekly on a Monday
+            #
+            15 08 * * 1 root run-webapp-job issues:send_user_report
+            #
+            # Resync translations with Transifex on Monday mornings
+            #
+            0 08 * * 1 root run-webapp-job i18n:transifex_load
+            #
+            # Delete old alert content
+            #
+            0 0 1 * * root run-webapp-job alerts:delete_alert_content
+            #
+            # Send Good Job queue metrics to AWS Cloudwatch
+            #
+            */5 * * * * root run-webapp-job jobs:send_good_job_queue_metrics_to_cloudwatch
+            #
+            # Send Review Group Tariffs Reminders
+            #
+            0 8 15 3,9 * root run-webapp-job school_groups:send_review_group_tariffs_reminder
+            #
+            # Send Review School Tariffs Reminders
+            #
+            0 8 15 3,9 * root run-webapp-job schools:send_review_school_tariffs_reminder
+            #
+            # Send Onboarding Reminder Emails
+            #
+            0 4 * * * root run-webapp-job onboarding:reminder_mailer
 
-# Remove baks else jobs get run twice
 commands:
-    remove_old_cloudwatch_job:
-        command: "rm -rf /etc/cron.d/cwpump"
-    remove_good_job_number_of_processes:
-        command: "rm -rf /etc/cron.d/send-good-job-number-of-processes-metrics-to-cloudwatch"
-    remove_good_job_memory_usage:
-        command: "rm -rf /etc/cron.d/send-good-job-memory-usage-metrics-to-cloudwatch"
+    # Remove baks else jobs get run twice
     remove_old_cron:
         command: "rm -f /etc/cron.d/*.bak"