- fix bug in useragent (bad variable name)

- make tests run correctly to catch future jar issues fixed above.
webbob · May 7, 2013 · 2b6326b · 2b6326b
1 parent 87044fb
commit 2b6326b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -216,11 +216,11 @@ build/flatgems: | build vendor/bundle
 	$(QUIET)rsync -a $(VENDOR_DIR)/gems/user_agent_parser-*/vendor/ua-parser $@/vendor
 
 flatjar-test:
-	GEM_HOME= GEM_PATH= java -jar build/logstash-$(VERSION)-flatjar.jar rspec $(TESTS)
+	cd build && GEM_HOME= GEM_PATH= java -jar build/logstash-$(VERSION)-flatjar.jar rspec $(TESTS)
 	cd build && GEM_HOME= GEM_PATH= java -jar logstash-$(VERSION)-flatjar.jar rspec spec/jar.rb
 
 jar-test:
-	GEM_HOME= GEM_PATH= java -jar build/logstash-$(VERSION)-monolithic.jar rspec $(TESTS)
+	cd build && GEM_HOME= GEM_PATH= java -jar build/logstash-$(VERSION)-monolithic.jar rspec $(TESTS)
 	cd build && GEM_HOME= GEM_PATH= java -jar logstash-$(VERSION)-monolithic.jar rspec spec/jar.rb
 
 flatjar-test-and-report:

diff --git a/lib/logstash/filters/useragent.rb b/lib/logstash/filters/useragent.rb
@@ -38,7 +38,7 @@ def register
           if __FILE__ =~ /file:\/.*\.jar!/
             # Running from a flatjar which has a different layout
             regexes_file = [__FILE__.split("!").first, "/vendor/ua-parser/regexes.yaml"].join("!")
-            @parser = UserAgentParser::Parser.new(:patterns_path => jar_path)
+            @parser = UserAgentParser::Parser.new(:patterns_path => regexes_file)
           else
             # assume operating from the git checkout
             @parser = UserAgentParser::Parser.new(:patterns_path => "vendor/ua-parser/regexes.yaml")