hotspotlogin 0.1.0 → 0.1.1

data/README.rdoc

@@ -18,16 +18,15 @@ Installation:
   
 On the command-line:
   
-  $ hotspotlogin_ctl.rb start|stop|run -- [options]
+  $ hotspotlogin.rb [options]
 
-where ‘start’ and ‘stop’ have obvious meanings, while ‘run’ makes the daemon
-run in foreground. Daemons gem documentation for more info.
+==== Options
 
-Or directly
+  --daemon		daemonize
 
-  $ hotspotlogin.rb [options]
+  --log			log file (ignored when no --daemon)
 
-==== Options
+  --pid			pid file (ignored when no --daemon)
 
   --port 		[default 4990]
 
@@ -42,6 +41,10 @@ Or directly
   --conf <FILE>		YAML configuration file, see examples/ 	
 
 See also chilli.conf(5) manual page.
+
+==== Unix Signals
+
+  USR1			sync/update log file (flush buffered I/O) 
   
 == LICENSE:
 

data/bin/hotspotlogin.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-$0 = 'hotspotlogin.rb'
+# Don'use this hack, since it breaks /proc/<pid>/cmdline
+# $0 = 'hotspotlogin.rb'
 
 require 'rubygems'
 require 'sinatra/base'
@@ -15,7 +16,26 @@ require File.expand_path(
   File.dirname(file) + "/../lib/hotspotlogin"
 )
 
-HotSpotLogin.config! 
-
-HotSpotLogin::App.run!
+config = HotSpotLogin.config!
 
+if config['daemon']
+  pid = fork do
+    if config['log'] 
+      STDOUT.reopen(config['log'], 'a')
+      STDERR.reopen(config['log'], 'a') 
+      Signal.trap('USR1') do
+        STDOUT.flush
+        STDERR.flush
+      end
+    end
+    HotSpotLogin::App.run!
+    FileUtils.rm config['pid'] if config['pid'] and File.exists? config['pid']
+  end
+  if config['pid'] =~ /\S/ 
+    File.open config['pid'], 'w' do |f|
+      f.write pid 
+    end
+  end
+else
+  HotSpotLogin::App.run!
+end

data/lib/hotspotlogin/app.rb

@@ -16,6 +16,8 @@ module HotSpotLogin
     set :port,    HotSpotLogin.config['port']
     set :logging, HotSpotLogin.config['log-http']
 
+    #set :run,     false
+
     include ERB::Util # for html_escape...
 
     result, titel, headline, bodytext = '', '', '', ''

data/lib/hotspotlogin/config.rb

@@ -9,7 +9,10 @@ module HotSpotLogin
 
   def self.config; @@config; end
 
-  def self.config=(h); @@config = h; end
+  def self.config=(h) 
+    @@config = h
+    config_sinatra!
+  end
 
   # Parses command line and configuration file
   def self.config!
@@ -25,6 +28,18 @@ module HotSpotLogin
 
       # Command line switches override configuration file.
 
+      opts.on('--daemon', 'become a daemon') do
+        @@config['daemon'] = true
+      end
+
+      opts.on('--log FILE', 'log file (overwrite existing)') do |filename|
+        @@config['log'] = filename
+      end
+
+      opts.on('--pid FILE', 'pid file') do |filename|
+        @@config['pid'] = filename
+      end
+
       opts.on('--uamsecret PASS', 'as in chilli.conf(5)') do |uamsecret|
         @@config['uamsecret'] = uamsecret
       end
@@ -47,11 +62,17 @@ module HotSpotLogin
 
     end.parse!
 
-    # Now, set the Sinatra App
+    self.config_sinatra!
+
+    return @@config
+  end
+
+  private  
+
+  def self.config_sinatra!
     App.set :host,    @@config['listen-address']
     App.set :port,    @@config['port']
     App.set :logging, @@config['log-http']
-    
   end
-    
+
 end

data/lib/hotspotlogin/constants.rb

@@ -1,6 +1,6 @@
 module HotSpotLogin
 
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   DEFAULT_CONFIG = {
     'listen-address'    => '0.0.0.0',

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -29,23 +29,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-description: Traditionally, a PHP or Perl/CGI web page has been used to login unauthenticated users to a Network Acces Controller like ChilliSpot; this hotspotlogin implementation is based on Ruby and Sinatra (the classy web framework).
+description: Traditionally, a PHP or Perl/CGI web page has been used to login unauthenticated users to a Network Access Controller like ChilliSpot; this hotspotlogin implementation is based on Ruby and Sinatra (the classy web framework).
 email: guidoderosa@gmail.com
-executables: 
-- hotspotlogin.rb
-- hotspotlogin_ctl.rb
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -57,7 +44,6 @@ files:
 - views/hotspotlogin.erb
 - views/404.erb
 - views/_login_form.erb
-- bin/hotspotlogin_ctl.rb
 - bin/hotspotlogin.rb
 - lib/hotspotlogin.rb
 - lib/hotspotlogin/constants.rb

data/bin/hotspotlogin_ctl.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'daemons'
-
-Daemons.run(
-  "#{File.dirname __FILE__}/hotspotlogin.rb",
-  {
-    :dir_mode => :system
-  }
-)
-
-