Fix data_dir and config_file not reading systemd env vars

spec/config_spec.cr

@@ -407,6 +407,84 @@ describe LavinMQ::Config do
     end
   end
 
+  it "uses systemd STATE_DIRECTORY as default for data_dir" do
+    begin
+      ENV["STATE_DIRECTORY"] = "/var/lib/custom-state"
+      config = LavinMQ::Config.new
+      config.parse([] of String)
+      config.data_dir.should eq "/var/lib/custom-state"
+    ensure
+      ENV.delete("STATE_DIRECTORY")
+    end
+  end
+
+  it "STATE_DIRECTORY takes precedence over INI data_dir" do
+    config_file = File.tempfile do |file|
+      file.print <<-CONFIG
+        [main]
+        data_dir = /tmp/lavinmq-ini
+      CONFIG
+    end
+    begin
+      ENV["STATE_DIRECTORY"] = "/var/lib/custom-state"
+      config = LavinMQ::Config.new
+      config.parse(["-c", config_file.path])
+      config.data_dir.should eq "/var/lib/custom-state"
+    ensure
+      ENV.delete("STATE_DIRECTORY")
+    end
+  end
+
+  it "LAVINMQ_DATADIR takes precedence over STATE_DIRECTORY" do
+    begin
+      ENV["STATE_DIRECTORY"] = "/var/lib/custom-state"
+      ENV["LAVINMQ_DATADIR"] = "/var/lib/lavinmq-explicit"
+      config = LavinMQ::Config.new
+      config.parse([] of String)
+      config.data_dir.should eq "/var/lib/lavinmq-explicit"
+    ensure
+      ENV.delete("STATE_DIRECTORY")
+      ENV.delete("LAVINMQ_DATADIR")
+    end
+  end
+
+  it "uses systemd CONFIGURATION_DIRECTORY for config file lookup" do
+    config_dir = File.tempname("lavinmq-conf")
+    Dir.mkdir_p(config_dir)
+    File.write(File.join(config_dir, "lavinmq.ini"), "[main]\nlog_level = fatal\n")
+    begin
+      ENV["CONFIGURATION_DIRECTORY"] = config_dir
+      config = LavinMQ::Config.new
+      config.parse([] of String)
+      config.config_file.should eq File.join(config_dir, "lavinmq.ini")
+    ensure
+      ENV.delete("CONFIGURATION_DIRECTORY")
+      FileUtils.rm_rf(config_dir)
+    end
+  end
+
+  it "LAVINMQ_CONFIGURATION_DIRECTORY takes precedence over CONFIGURATION_DIRECTORY" do
+    config_dir = File.tempname("lavinmq-conf")
+    Dir.mkdir_p(config_dir)
+    File.write(File.join(config_dir, "lavinmq.ini"), "[main]\nlog_level = fatal\n")
+    systemd_dir = File.tempname("lavinmq-systemd")
+    Dir.mkdir_p(systemd_dir)
+    File.write(File.join(systemd_dir, "lavinmq.ini"), "[main]\nlog_level = fatal\n")
+    begin
+      ENV["CONFIGURATION_DIRECTORY"] = systemd_dir
+      ENV["LAVINMQ_CONFIGURATION_DIRECTORY"] = config_dir
+      config = LavinMQ::Config.new
+      config.parse([] of String)
+      # config_file should NOT point to the systemd_dir
+      config.config_file.should_not contain systemd_dir
+    ensure
+      ENV.delete("CONFIGURATION_DIRECTORY")
+      ENV.delete("LAVINMQ_CONFIGURATION_DIRECTORY")
+      FileUtils.rm_rf(config_dir)
+      FileUtils.rm_rf(systemd_dir)
+    end
+  end
+
   it "accepts deprecated [http] section as alias for [mgmt]" do
     config_file = File.tempfile do |file|
       file.print <<-CONFIG

src/lavinmq/config.cr

@@ -27,8 +27,9 @@ module LavinMQ
     # Command line arguments take precedence over environment variables,
     # which take precedence over the configuration file.
     def parse(argv = ARGV)
+      config_dir = ENV.fetch("LAVINMQ_CONFIGURATION_DIRECTORY") { ENV.fetch("CONFIGURATION_DIRECTORY", "/etc/lavinmq") }
       @config_file = File.exists?(
-        File.join(ENV.fetch("LAVINMQ_CONFIGURATION_DIRECTORY", "/etc/lavinmq"), "lavinmq.ini")) ? File.join(ENV.fetch("LAVINMQ_CONFIGURATION_DIRECTORY", "/etc/lavinmq"), "lavinmq.ini") : ""
+        File.join(config_dir, "lavinmq.ini")) ? File.join(config_dir, "lavinmq.ini") : ""
       parse_config_from_cli(argv)
       parse_ini(@config_file)
       parse_env()
@@ -50,10 +51,12 @@ module LavinMQ
 
     private def parse_env
       {% for ivar in @type.instance_vars.select(&.annotation(EnvOpt)) %}
-        {% env_name, transform = ivar.annotation(EnvOpt).args %}
-        if v = ENV.fetch({{env_name}}, nil)
-          @{{ivar}} = parse_value(v, {{transform || ivar.type}})
-        end
+        {% for ann in ivar.annotations(EnvOpt) %}
+          {% env_name, transform = ann.args %}
+          if v = ENV.fetch({{env_name}}, nil)
+            @{{ivar}} = parse_value(v, {{transform || ivar.type}})
+          end
+        {% end %}
       {% end %}
     end
 

src/lavinmq/config/options.cr

@@ -13,11 +13,11 @@ module LavinMQ
       DEFAULT_PASSWORD_HASH = Auth::Password::SHA256Password.new("+pHuxkR9fCyrrwXjOD4BP4XbzO3l8LJr8YkThMgJ0yVHFRE+") # Hash of 'guest'
 
       @[CliOpt("-c CONFIG", "--config=CONFIG", "Path to config file", section: "options")]
-      @[EnvOpt("LAVINMQ_CONFIGURATION_DIRECTORY")]
       property config_file = ""
 
       @[CliOpt("-D DIRECTORY", "--data-dir=DIRECTORY", "Data directory", section: "options")]
       @[IniOpt(section: "main")]
+      @[EnvOpt("STATE_DIRECTORY")]
       @[EnvOpt("LAVINMQ_DATADIR")]
       property data_dir : String = "/var/lib/lavinmq"