apphunkd 0.11.1 → 0.12.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 rubyphunk
+Copyright (c) 2009-10 Andreas Wolff
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,18 +1,34 @@
 = apphunkd
 
-Description goes here.
+A daemon that acts as proxy between the apphunk gem and apphunk.com. 
+It collects messages from one or more apps, takes care that they don't get lost (e.g. apphunk.com is down) and sends them to the remote host.
+
+== Setup
+
+Apphunkd comes as a Gem:
+
+  gem install apphunkd
+
+== Usage
+
+You can start it by "hand" saying:
+
+  apphunkd start 
+  
+However, apphunkd has init.d and monit scripts on board (see the support directory).
+After copying the init script to /etc/init.d/ you can control the daemon with:
+
+  sudo /etc/init.d/apphunkd {start|stop|restart|status}
+
 
 == Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+* Add specs for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright
 
-Copyright (c) 2009 rubyphunk. See LICENSE for details.
+Copyright (c) 2009-10 Andreas Wolff. See LICENSE for details.

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.authors = ["Andreas Wolff"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
+    gem.add_dependency "eventmachine", ">= 0"
     gem.add_dependency "sinatra", ">= 0.9.4"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/TODO

@@ -1,2 +1 @@
-+ Jeweler support
 + Monit: RAM Begrenzung

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.12.0

data/apphunkd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apphunkd}
-  s.version = "0.11.1"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Wolff"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-04-06}
   s.default_executable = %q{apphunkd}
   s.description = %q{
       Apphunkd is a ruby based daemon that runs on your application-servers and acts as local proxy between your apps and apphunk.com.
@@ -247,15 +247,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
   end
 end

data/config/environment.rb

@@ -12,7 +12,7 @@ DaemonKit::Initializer.run do |config|
   config.daemon_name = 'apphunkd'
 
   # Force the daemon to be killed after X seconds from asking it to
-  # config.force_kill_wait = 30
+  config.force_kill_wait = 10
 
   # Log backraces when a thread/daemon dies (Recommended)
   # config.backtraces = true

data/config/environments/development.rb

@@ -1,2 +0,0 @@
-config.pid_file = '/tmp/apphunkd.pid'
-config.log_path = '/tmp/apphunkd.log'

data/config/environments/production.rb

@@ -1,2 +0,0 @@
-config.pid_file = '/var/run/apphunkd.pid'
-config.log_path = '/var/log/apphunkd.log'

data/lib/apphunkd/queue.rb

@@ -24,7 +24,6 @@ module Apphunkd
         @items << message
       end
 
-      @worker.wakeup
       return true
     end
 
@@ -32,7 +31,8 @@ module Apphunkd
       Thread.new do
         begin
           loop do
-            unless @items.empty?
+            unless @items.empty? && @working
+              @working = true
               items = get_items_from_stack
               items.each do |item|
                 result = push_item_to_remote_service(item)
@@ -52,7 +52,8 @@ module Apphunkd
                 end
               end
             end
-            sleep
+            @working = false
+            sleep 5
           end
         rescue => e
           log_error "Error: #{e}"
@@ -84,9 +85,9 @@ module Apphunkd
       def generate_api_messages_url(token)
         path = "v1/#{token}/messages"
         if DaemonKit.env.to_s == 'production'
-          "http://postbox.apphunk.com/#{path}"
+          "http://api.apphunk.com/#{path}"
         else
-          "http://postbox.apphunk.local/#{path}"
+          "http://localhost:3000/#{path}"
         end
       end
 

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ rescue LoadError
   require 'spec'
 end
 
+ENV['DAEMON_ENV'] = 'test'
 require File.dirname(__FILE__) + '/../config/environment'
 DaemonKit::Application.running!
 

data/support/apphunkd.initd

@@ -7,12 +7,12 @@
 
 def start
   puts "Starting.."
-  `apphunkd start -e production`
+  `apphunkd start -e production --log /var/log/apphunkd.log --pidfile /var/run/apphunkd.pid`
 end
 
 def stop
   puts "Stopping.."
-  `apphunkd stop -e production`
+  `apphunkd stop -e production --log /var/log/apphunkd.log --pidfile /var/run/apphunkd.pid`
 end
 
 def restart

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: apphunkd
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors: 
 - Andreas Wolff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-04-06 00:00:00 +02:00
 default_executable: apphunkd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   type: :runtime