[Ngetsuite-cvs] ngetsuite daemon.rb,1.10,1.11 ngetcache.sql,1.8,1.9

[<jj...@us...>]

Update of /cvsroot/ngetsuite/ngetsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16067

Modified Files:
	daemon.rb ngetcache.sql 
Log Message:
daemon and manager handles shutdown, added 'FAILED' status for downloaded file


Index: daemon.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/daemon.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** daemon.rb	2 Feb 2004 17:44:18 -0000	1.10
--- daemon.rb	3 Feb 2004 21:29:38 -0000	1.11
***************
*** 15,19 ****
  
  if not $config.include? 'dbpass'
! 	puts "Missing required value in config file : dbpass"
  	exit 1
  end
--- 15,19 ----
  
  if not $config.include? 'dbpass'
! 	puts 'Missing required value in config file : dbpass'
  	exit 1
  end
***************
*** 35,53 ****
  end
  
  $manager = NgetSuite::DownloadManager.new(max_dls, basedir)
  
! DRb.start_service('druby://localhost:' + port.to_s, $manager)
  
! if $config.fetch('autostart_httpd', false)
  	require 'webrick'
  	include WEBrick
  	s = HTTPServer.new(
! 	  :Port            => ($config.fetch('httpd_port', 2000)),
! 	  :DocumentRoot    => Dir::pwd + "/web"
!     )
! 	trap("INT"){ s.shutdown }
! 	httpThread = Thread.new { s.start }
  	httpThread.join
  end
! 
! DRb.thread.join
--- 35,62 ----
  end
  
+ puts "Starting daemon with log file '#{logfile}'"
  $manager = NgetSuite::DownloadManager.new(max_dls, basedir)
  
! drburl = 'druby://localhost:' + port.to_s
! DRb.start_service(drburl, $manager)
  
! $thingsrunning = [$manager]
! trap('INT') { $thingsrunning.each{ |t| t.shutdown }; DRb.stop_service }
! trap('TERM') { $thingsrunning.each{ |t| t.shutdown }; DRb.stop_service }
! 
! if $config.fetch('autostart_httpd', false) or $config.fetch('httpd_autostart', false)
  	require 'webrick'
  	include WEBrick
+ 	
+ 	port = $config.fetch('httpd_port', 2000)
+ 	puts "Starting web server on port #{port}"
+ 	log 'Web server start'
  	s = HTTPServer.new(
! 		:Port            => port,
! 		:DocumentRoot    => Dir::pwd + File::Separator + 'web'
! 	)
! 	$thingsrunning << s
! 	httpThread = Thread.new { s.start ; log 'Web server down' }
  	httpThread.join
  end
! DRb.thread.join if DRb.thread

Index: ngetcache.sql
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetcache.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ngetcache.sql	27 Oct 2003 23:06:12 -0000	1.8
--- ngetcache.sql	3 Feb 2004 21:29:38 -0000	1.9
***************
*** 77,81 ****
    `date_started` datetime default NULL,
    `date_finished` datetime default NULL,
!   `status` set('PENDING','PROCESSING','FINISHED','STOPPED') NOT NULL default 'PENDING',
    `nbfiles` smallint(6) NOT NULL default '0',
    `finalword` varchar(64) default NULL,
--- 77,81 ----
    `date_started` datetime default NULL,
    `date_finished` datetime default NULL,
!   `status` set('PENDING','PROCESSING','FINISHED','STOPPED', 'FAILED') NOT NULL default 'PENDING',
    `nbfiles` smallint(6) NOT NULL default '0',
    `finalword` varchar(64) default NULL,