remote_syslog 0.1.0 → 1.0.0

data/README.md

@@ -24,7 +24,7 @@ transmitting to any syslog server.
 
 Install the gem, which includes a binary called "remote_syslog":
 
-    gem install remote_syslog
+    $ [sudo] gem install remote_syslog
 
 Optionally, create a log_files.yml with the log file paths to read and the 
 host/port to log to (see examples/log_files.yml.example). These can also be 
@@ -53,44 +53,54 @@ specified as arguments to the remote_syslog daemon. More below.
 
 Daemonize, collecting from files mentioned in ./config/logs.yml as well as
 /var/log/mysqld.log:
-    remote_syslog -c configs/logs.yml -p 12345 /var/log/mysqld.log
+    $ remote_syslog -c configs/logs.yml -p 12345 /var/log/mysqld.log
 
 Stay attached to the terminal, look for and use /etc/log_files.yml if it exists, 
 write PID to /tmp/remote_syslog.pid, and send with facility local0:
-    remote_syslog -d a.server.com -f local0 -P /tmp /var/log/mysqld.log
+    $ remote_syslog -d a.server.com -f local0 -P /tmp /var/log/mysqld.log
 
 remote_syslog will daemonize by default. A sample init file is in the gem as 
 remote_syslog.init.d. You may be able to:
-    cp examples/remote_syslog.init.d /etc/init.d/remote_syslog
+    $ cp examples/remote_syslog.init.d /etc/init.d/remote_syslog
 
 
 ## Configuration
 
+By default, the gem looks for a configuration in /etc/log_files.yml.
+
 The gem comes with a sample config.  Optionally:
 
-    cp examples/log_files.yml.example /etc/log_files.yml
+    $ cp examples/log_files.yml.example /etc/log_files.yml
     
 log_files.yml has filenames to log from (as an array) and hostname and port 
 to log to (as a hash).  Only 1 destination server is supported; the command-line
 argument wins.  Filenames given on the command line are additive to those 
 in the config file.
 
+    files: [/var/log/httpd/access_log, /var/log/httpd/error_log, /var/log/mysqld.log, /var/run/mysqld/mysqld-slow.log]
+    destination:
+      host: logs.papertrailapp.com
+      port: 12345
+
 
-## Contribute
+## Reporting bugs
 
-Bug report:
 
-1. See whether the issue has already been reported:
-   http://github.com/papertrail/remote_syslog/issues/
+1. See whether the issue has already been reported: <https://github.com/papertrail/remote_syslog/issues/>
 2. If you don't find one, create an issue with a repro case.
 
-Enhancement or fix:
 
-1. Fork the project:
-   http://github.com/papertrail/remote_syslog
-2. Make your changes with tests.
-3. Commit the changes without changing the Rakefile or other files unrelated 
-to your enhancement.
-4. Send a pull request.
+## Contributing
+
+Once you've made your great commits:
+
+1. [Fork][fk] remote_syslog
+2. Create a topic branch - `git checkout -b my_branch`
+3. Commit the changes without changing the Rakefile or other files unrelated to your enhancement.
+4. Push to your branch - `git push origin my_branch`
+5. Create a Pull Request or an [Issue][is] with a link to your branch
+6. That's it!
 
-[Papertrail]: http://papertrailapp.com/
+[fk]: http://help.github.com/forking/
+[is]: https://github.com/papertrail/remote_syslog/issues/
+[Papertrail]: http://papertrailapp.com/

data/bin/remote_syslog

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'bundler'
-
 require 'optparse'
 require 'yaml'
 require 'pathname'
@@ -90,8 +87,8 @@ def remote_syslog_daemon(args)
     exit
   end
 
-  # handle relative paths before Daemonize changes the wd to /
-  files.map! { |f| File.expand_path(f) }
+  # handle relative paths before Daemonize changes the wd to / and expand wildcards
+  files = files.map { |f| Dir.glob(f) }.flatten.map { |f| File.expand_path(f) }.uniq
 
   Daemons.run_proc(daemonize_options[:app_name], daemonize_options) do
     EventMachine.run do

data/examples/log_files.yml.example

@@ -1,4 +1,4 @@
 files: [/var/log/httpd/access_log, /var/log/httpd/error_log, /var/log/mysqld.log, /var/run/mysqld/mysqld-slow.log]
 destination:
   host: logs.papertrailapp.com
-  port: 12345
+  port: 12345   # optional, defaults to 514

data/lib/remote_syslog.rb

@@ -1,5 +1,5 @@
 module RemoteSyslog
- VERSION = "0.1.0"
+ VERSION = "1.0.0"
 end
 
 require 'remote_syslog/levels'

data/remote_syslog.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'remote_syslog'
-  s.version           = '0.1.0'
-  s.date              = '2010-12-17'
+  s.version           = '1.0.0'
+  s.date              = '2011-03-22'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long
@@ -58,7 +58,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_syslog
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
-  - 0
   - 1
   - 0
-  version: 0.1.0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Papertrail
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -08:00
+date: 2011-03-22 00:00:00 -07:00
 default_executable: remote_syslog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,6 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,14 +0,0 @@
-GEM
-  specs:
-    daemons (1.1.0)
-    eventmachine (0.12.10)
-    eventmachine-tail (0.5.20101005181243)
-      eventmachine
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  daemons
-  eventmachine
-  eventmachine-tail