stampeded 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 662d823a0b9ccdc994a154d1d88fe0c687caec91ac5d154b752addefb34f569d
-  data.tar.gz: 16dc7a04b4b341e578b5d8f4d22a6a68abfec9789a1326db604985963158cae3
+  metadata.gz: a50b1c2cae8717087b4e44f994f1cc0291f3697f4d7e83e00645e4dd7ab3606b
+  data.tar.gz: a2ec4b8049253aacb16cd388915eb4d58521bbfcb17754ab2a4cd65b359f96b5
 SHA512:
-  metadata.gz: 17a5c16f58a274f8d1767bf2801a6bac7541ef339d57b5ff227fb5007b2ee90a4f22cd0ddae555752b39588d375bd94a4ae58270ccb3d0e1a39c4e41cdc0253f
-  data.tar.gz: 286dd6f4b6840454529bdb53f5c0be1a352011dfeb43a129dcdf5080c2f018cb6f0756ba806163a5b450270c1f97c70295dceaf3e9e0427c55f7c0d89e0b0aa5
+  metadata.gz: 23c572d3df98d6fd785694ca5dbad18ead88bc5b934fd65a83e35d6833122ba4b806ce7426e1c8be6814e1d921056027ef30355958d5ae2bc3aa09e8a92a53f9
+  data.tar.gz: 144d968a12f04ff3e094bddeefb3835e168bd4b03b46501692a86259d6dd809f2dbedb352135c26ee28993fbbea2d707553022a0ca4e52dc7629dca25f399acd

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(", ")})")

data/lib/stampeded/tasks/stampeded.rake

@@ -25,8 +25,7 @@ namespace :stampeded do
   desc "Run the daemon (scheduler, reaper, pruner, dashboard). Not the worker."
   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)
+    args = ["--no-worker", *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.3.2" # 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)

metadata

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