stampeded 0.3.1-x86_64-linux-gnu → 0.4.0-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3888a2ca7ea95040578b4baf9a706d40c648ff282026767e3f219e857cdcf8
-  data.tar.gz: c3f6439b9e13d247640531a2c91a65d0daba48c1c05a18a3bc4d647cf079fc6b
+  metadata.gz: cad7f788cd761495c62f13f696e9a8b6a278fe20cddaf2973deed5fc58e1fb1f
+  data.tar.gz: 28788406522070a1ed14f54d8b855e26c7c3c0501c4b69bf6c4466d66f575807
 SHA512:
-  metadata.gz: 0f04b0d2a233b276ddaee6303c621d838cc3483951c87c8723fced0bf6efc08530fcc3c3c4f6f0d0f74b8684b3f8e10d3b4596f35e698d5f835dbb562059276d
-  data.tar.gz: 6eebb4678996da06029c262ac19c3e76e6b0d7533711ec6d89ec4101c13bfb4ef25a1e56a949e4ae03487842387b877457ff24b54c75cb7a7dc642e4228f61ff
+  metadata.gz: 47083a221b84efec03e9693cd4cc543307c9c59f35aad9772a8d43b8de48c99fb31b0a770e5ee178ba693c2505b1afba9f0a30a08018528fb51a2d0f46ee9d1e
+  data.tar.gz: bb24cac65641ca47c82780535a3325bfab125306a7d14a9ed0536d0bcabbbe77c93c76aa97335fea0820a67a8be71ffc35bd971776d57034fcdd7035432e4ede

data/README.md

@@ -25,6 +25,14 @@ scheduler, reaper, pruner, expirer, health checks, HTTP API and dashboard. It
 never runs a job itself. Without the daemon, jobs still run, but there is no
 cron, no recovery of jobs from dead workers, no retention and no dashboard.
 
+The daemon gets the database URL through its environment, never its command
+line. Extra flags go in `STAMPEDED_ARGS`, which `ps` shows to everyone on the
+host, so the dashboard token goes in `STAMPEDED_DASHBOARD_TOKEN` instead:
+
+```bash
+STAMPEDED_DASHBOARD_TOKEN=... STAMPEDED_ARGS="--http 127.0.0.1:7878" bin/rails stampeded:daemon
+```
+
 ## Transactional enqueue
 
 ```ruby

data/lib/stampeded/daemon.rb

@@ -44,8 +44,9 @@ module Stampeded
       false
     end
 
-    def exec!(*args)
-      Kernel.exec(executable, *args)
+    def exec!(*args, env: {})
+      path = executable
+      Kernel.exec(env, [path, path], *args)
     end
   end
 end

data/lib/stampeded/schema.rb

@@ -9,7 +9,7 @@ module Stampeded
     def root
       candidates = [
         File.expand_path("../../schema", __dir__),
-        File.expand_path("../../../schema", __dir__)
+        File.expand_path("../../../crates/stampeded/schema", __dir__)
       ]
       candidates.find { |d| File.directory?(d) } ||
         raise(Error, "cannot find schema/*.sql (looked in #{candidates.join(", ")})")
@@ -39,7 +39,8 @@ module Stampeded
         c.exec(<<~SQL)
           DROP TABLE IF EXISTS stampeded_cron_occurrences, stampeded_schedules,
                                stampeded_queue_policies, stampeded_queue_counts,
-                               stampeded_jobs, stampeded_workers CASCADE;
+                               stampeded_jobs, stampeded_workers,
+                               stampeded_schema CASCADE;
           DO $$
           DECLARE r record;
           BEGIN

data/lib/stampeded/tasks/stampeded.rake

@@ -22,11 +22,11 @@ namespace :stampeded do
     worker.run
   end
 
-  desc "Run the daemon (scheduler, reaper, pruner, dashboard). Not the worker."
+  desc "Run the daemon (scheduler, reaper, pruner, dashboard). Not the worker. Upgrades the schema first."
   task daemon: :environment do
     require "stampeded/daemon"
-    args = ["--database-url", Stampeded.database_url_for_daemon, "--no-worker"]
-    args += ENV["STAMPEDED_ARGS"].to_s.split
-    Stampeded::Daemon.exec!(*args)
+    # --migrate is safe on every start: it upgrades an older schema in place.
+    args = ["--no-worker", "--migrate", *ENV["STAMPEDED_ARGS"].to_s.split]
+    Stampeded::Daemon.exec!(*args, env: { "STAMPEDED_DATABASE_URL" => Stampeded.database_url_for_daemon })
   end
 end

data/lib/stampeded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stampeded
-  VERSION = "0.3.1" # x-release-please-version
+  VERSION = "0.4.0" # x-release-please-version
 end

data/lib/stampeded.rb

@@ -50,9 +50,14 @@ module Stampeded
       params = Connection.connection_params
       return params if params.is_a?(String)
 
-      user = [params[:user], params[:password]].compact.join(":")
-      host = [params[:host], params[:port]].compact.join(":")
-      "postgres://#{user}#{"@" unless user.empty?}#{host}/#{params[:dbname]}"
+      userinfo = URI.encode_uri_component(params[:user].to_s)
+      userinfo += ":#{URI.encode_uri_component(params[:password].to_s)}" if params[:password]
+      host = params[:host].to_s
+      host = host.include?(":") ? "[#{host}]" : URI.encode_uri_component(host)
+      host += ":#{params[:port]}" if params[:port]
+      url = "postgres://#{userinfo}#{"@" unless userinfo.empty?}#{host}/#{URI.encode_uri_component(params[:dbname].to_s)}"
+      tls = params.slice(*Connection::TLS_KEYS).map { |key, value| "#{key}=#{URI.encode_uri_component(value.to_s)}" }
+      tls.empty? ? url : "#{url}?#{tls.join("&")}"
     end
 
     def create_queue(name)

data/schema/schema.sql

@@ -65,15 +65,20 @@ CREATE TABLE stampeded_jobs (
     dedup_period    text        CHECK (dedup_period IN
                                   ('minute','hour','day','week','month')),
 
+    -- Scope, period and bucket: buckets of two periods start together (an
+    -- hour and its day at midnight UTC), so the period keeps them apart.
+    -- Joined as bytea with a raw zero byte: no `text` value can ever decode
+    -- to one (chr(0) itself is refused), so a crafted dedup_scope can never
+    -- forge the separator and so never forge another row's key.
     dedup_key       bytea       GENERATED ALWAYS AS (
-        sha256((
-            dedup_scope || coalesce(
-                ':' || extract(
+        sha256(
+            dedup_scope::bytea || '\x00'::bytea || coalesce(
+                dedup_period::bytea || '\x00'::bytea || extract(
                     epoch FROM (date_trunc(dedup_period, inserted_at, 'UTC') - to_timestamp(0))
-                )::bigint::text,
-                ''
+                )::bigint::text::bytea,
+                ''::bytea
             )
-        )::bytea)
+        )
     ) STORED,
 
     failure_kind    text,
@@ -1047,3 +1052,13 @@ CREATE TABLE stampeded_queue_policies (
     created_at     timestamptz NOT NULL DEFAULT now(),
     updated_at     timestamptz NOT NULL DEFAULT now()
 );
+
+-- Which schema this database holds, one row: `stampeded::schema::migrate`
+-- upgrades from it and refuses one newer than itself. Raised by each upgrade.
+CREATE TABLE stampeded_schema (
+    version     integer     NOT NULL CHECK (version > 0),
+    changed_at  timestamptz NOT NULL DEFAULT now()
+);
+CREATE UNIQUE INDEX stampeded_schema_one_row ON stampeded_schema ((true));
+-- Must match schema::VERSION.
+INSERT INTO stampeded_schema (version) VALUES (3);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stampeded
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: x86_64-linux-gnu
 authors:
 - Abdelkader Boudih