Update README.md

.gitignore

@@ -1,5 +0,0 @@
-*.gem
-Gemfile.lock
-Gemfile.bak
-.bundle
-vendor

Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gemspec

README.md

@@ -1,23 +1,15 @@
-# logstash-output-jdbc
+# logstash-jdbc
 
-**This is an old version of the plugin, for Logstash v1.5 only. It is no longer receiving backports of fixes and contains several flaws which have been addressed in the Logstash v2 compatible versions, and above. Please upgrade/see the other branches in the source repository.**
+**This is an old version of the plugin, for Logstash v1.4 only. It is no longer receiving backports of fixes and contains several flaws which have been addressed in the Logstash v2 compatible versions, and above. Please upgrade/see the other branches in the source repository.**
 
+JDBC output plugin for Logstash.
 This plugin is provided as an external plugin and is not part of the Logstash project.
 
-This plugin allows you to output to SQL databases, using JDBC adapters.
-See below for tested adapters, and example configurations.
-
+## Warning
 This has not yet been extensively tested with all JDBC drivers and may not yet work for you.
 
-This plugin does not bundle any JDBC jar files, and does expect them to be in a
-particular location. Please ensure you read the 4 installation lines below.
-
-## Versions
-  - See v1.5 branch for logstash v1.5 
-  - See v1.4 branch for logstash 1.4
-
 ## Installation
-  - Run `bin/plugin install logstash-output-jdbc` in your logstash installation directory
+  - Copy lib directory contents into your logstash installation.
   - Create the directory vendor/jar/jdbc in your logstash installation (`mkdir -p vendor/jar/jdbc/`)
   - Add JDBC jar files to vendor/jar/jdbc in your logstash installation
   - Configure
@@ -101,20 +93,4 @@ output {
 }
 ```
 
-### Mysql
-With thanks to [@jMonsinjon](https://github.com/jMonsinjon) 
-  * Tested with Version 14.14 Distrib 5.5.43, for debian-linux-gnu (x86_64)
-  * Tested using http://dev.mysql.com/downloads/file.php?id=457911 (mysql-connector-java-5.1.36-bin.jar)
-```
-input
-{
-	stdin { }
-}
-output {
-	jdbc {
-		driver_class => "com.mysql.jdbc.Driver"
-		connection_string => "jdbc:mysql://HOSTNAME/DATABASE?user=USER&password=PASSWORD"
-		statement => [ "INSERT INTO log (host, timestamp, message) VALUES(?, CAST (? AS timestamp), ?)", "host", "@timestamp", "message" ]
-	}
-}
-```
+/* vim: set ts=4 sw=4 tw=0 :*/

Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"

lib/logstash/outputs/jdbc.rb

@@ -9,6 +9,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   include Stud::Buffer
 
   config_name "jdbc"
+  milestone 1
 
   # Driver class
   config :driver_class, :validate => :string
@@ -49,21 +50,11 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
 
   public
   def register
-
     @logger.info("JDBC - Starting up")
 
-    if ENV['LOGSTASH_HOME']
-      jarpath = File.join(ENV['LOGSTASH_HOME'], "/vendor/jar/jdbc/*.jar")
-    else
-      jarpath = File.join(File.dirname(__FILE__), "../../../vendor/jar/jdbc/*.jar")
-    end
-
-    @logger.debug("JDBC - jarpath", path: jarpath)
-
-    jars = Dir[jarpath]
-    raise Exception.new("JDBC - No jars found in jarpath. Have you read the README?") if jars.empty?
-
-    jars.each do |jar|
+    jarpath = File.join(File.dirname(__FILE__), "../../../vendor/jar/jdbc/*.jar")
+    @logger.info(jarpath)
+    Dir[jarpath].each do |jar|
       @logger.debug("JDBC - Loaded jar", :jar => jar)
       require jar
     end
@@ -108,7 +99,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
 
       @statement[1..-1].each_with_index do |i, idx|
         case event[i]
-        when Time, LogStash::Timestamp
+        when Time
           # Most reliable solution, cross JDBC driver
           statement.setString(idx + 1, event[i].iso8601())
         when Fixnum, Integer
@@ -117,12 +108,6 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
           statement.setFloat(idx + 1, event[i])
         when String
           statement.setString(idx + 1, event[i])
-        when true
-          statement.setBoolean(idx + 1, true)
-        when false
-          statement.setBoolean(idx + 1, false)
-        when nil
-          statement.setString(idx + 1, nil)
         else
           statement.setString(idx + 1, event.sprintf(i))
         end
@@ -139,9 +124,6 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
       # Since the exceutebatch failed this should mean any events failed to be
       # inserted will be re-run. We're going to log it for the lols anyway.
       @logger.warn("JDBC - Exception. Will automatically retry", :exception => e)
-      if e.getNextException() != nil
-	      @logger.warn("JDBC - Exception. Will automatically retry", :exception => e.getNextException())
-  	  end
     end
 
     statement.close()

logstash-output-jdbc.gemspec

@@ -1,24 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'logstash-output-jdbc'
-  s.version = "0.1.1"
-  s.licenses = [ "Apache License (2.0)" ]
-  s.summary = "This plugin allows you to output to SQL, via JDBC"
-  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
-  s.authors = ["the_angry_angel"]
-  s.email = "karl+github@theangryangel.co.uk"
-  s.homepage = "https://github.com/theangryangel/logstash-output-jdbc"
-  s.require_paths = [ "lib" ]
-
-  # Files
-  s.files = `git ls-files`.split($\)
-   # Tests
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
-
-  # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
-
-  # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 1.4.0", "< 2.0.0"
-  s.add_runtime_dependency "logstash-codec-plain"
-  s.add_development_dependency "logstash-devutils"
-end