Merge pull request #34 from wchen-r7/https_fix

Fix issue with sending data over HTTP when webstats_https is true
stephenfewer · Apr 14, 2014 · 61333df · 61333df
2 parents 368a2ae + 1153e4c
commit 61333df
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/node/core/server.rb b/node/core/server.rb
@@ -65,7 +65,7 @@ def tcpm_update
 					if( minutes_since_last_update > webstats_update_minutes )
 						begin
 							if( $webstats_baseurl and $webstats_key )
-								web = ::Grinder::Core::WebStats.new( $grinder_node, $webstats_baseurl, $webstats_key, $webstats_username, $webstats_password )
+								web = ::Grinder::Core::WebStats.new( $grinder_node, $webstats_baseurl, $webstats_key, $webstats_username, $webstats_password, $webstats_https )
 
 								if( @@reductor )
 									web.update_job_status( @@testcases_since_update / webstats_update_minutes, ::Grinder::Core::WebStats::JOB_REDUCTION )
@@ -202,7 +202,7 @@ def initialize( address, port, browser=nil, fuzzer=nil, reduction=nil )
 				GrinderServlet.reduction( reduction )
 
 				if( $webstats_baseurl and $webstats_key )
-					web = ::Grinder::Core::WebStats.new( $grinder_node, $webstats_baseurl, $webstats_key, $webstats_username, $webstats_password )
+					web = ::Grinder::Core::WebStats.new( $grinder_node, $webstats_baseurl, $webstats_key, $webstats_username, $webstats_password, $webstats_https )
 					if( reduction )
 						web.update_job_status( 0, ::Grinder::Core::WebStats::JOB_REDUCTION )
 					else