Move worker config to config file

mozilla · Dec 1, 2016 · a50c47e · a50c47e
1 parent a70a86f
commit a50c47e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/bin/ssh_scan_worker b/bin/ssh_scan_worker
@@ -3,10 +3,8 @@ $:.unshift File.join(File.dirname(__FILE__), "../lib")
 
 require 'ssh_scan'
 
-opts = {
-  "server" => "192.168.10.37",
-  "port" => 8000
-}
+# Get the worker config from command-line or via an example location
+config_file = ARGV[0] || File.join(File.dirname(__FILE__), "ssh_scan_worker_example_config.yml")
 
-worker = SSHScan::Worker.new({:server => "192.168.10.37", :port => 8000})
+worker = SSHScan::Worker.from_config_file(config_file)
 worker.run!
diff --git a/bin/ssh_scan_worker_example_config.yml b/bin/ssh_scan_worker_example_config.yml
@@ -0,0 +1,2 @@
+server: 127.0.0.1
+port: 8000
diff --git a/lib/ssh_scan/worker.rb b/lib/ssh_scan/worker.rb
@@ -13,6 +13,11 @@ def initialize(opts = {})
       @verify_ssl = false
     end
 
+    def self.from_config_file(file_string)
+      opts = YAML.load_file(file_string)
+      self.new(opts)
+    end
+
     def run!
       loop do
         begin