Merge pull request #136 from klobuczek/master

added the option to configure an existing logger (e.g. Rails.logger)
maxdemarzi · Jan 23, 2014 · b3936d8 · b3936d8
2 parents 8737a75 + 3c9583e
commit b3936d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/neography/config.rb b/lib/neography/config.rb
@@ -3,7 +3,7 @@ class Config
 
     attr_accessor :protocol, :server, :port, :directory,
       :cypher_path, :gremlin_path,
-      :log_file, :log_enabled, :slow_log_threshold,
+      :log_file, :log_enabled, :logger, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
       :parser, :max_execution_time
@@ -22,6 +22,7 @@ def to_hash
         :gremlin_path       => @gremlin_path,
         :log_file           => @log_file,
         :log_enabled        => @log_enabled,
+        :logger             => @logger,
         :slow_log_threshold => @slow_log_threshold,
         :max_threads        => @max_threads,
         :authentication     => @authentication,

diff --git a/lib/neography/connection.rb b/lib/neography/connection.rb
@@ -89,6 +89,7 @@ def save_local_configuration(config)
       @slow_log_threshold = config[:slow_log_threshold]
       @max_threads        = config[:max_threads]
       @parser             = config[:parser]
+      @logger             = config[:logger]
 
       @max_execution_time = { 'max-execution-time' => config[:max_execution_time] }
       @user_agent     = { "User-Agent" => USER_AGENT }
@@ -104,7 +105,7 @@ def save_local_configuration(config)
       end
 
       if @log_enabled
-        @logger = Logger.new(@log_file)
+        @logger ||= Logger.new(@log_file)
       end
     end
 

diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
@@ -15,6 +15,7 @@ module Neography
       its(:gremlin_path)       { should == '/ext/GremlinPlugin/graphdb/execute_script' }
       its(:log_file)           { should == 'neography.log' }
       its(:log_enabled)        { should == false }
+      its(:logger)             { should == nil }
       its(:slow_log_threshold) { should == 0 }
       its(:max_threads)        { should == 20 }
       its(:authentication)     { should == nil }
@@ -33,6 +34,7 @@ module Neography
           :gremlin_path       => '/ext/GremlinPlugin/graphdb/execute_script',
           :log_file           => 'neography.log',
           :log_enabled        => false,
+          :logger             => nil,
           :slow_log_threshold => 0,
           :max_threads        => 20,
           :authentication     => nil,