New Poller daemon worker can discover and refresh devices. New Scheduler daemon worker replaces the cron jobs with config. New netdisco-do script allows running a job one-off from CLI. Squashed commit of the following: commitfa25f36e14Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Apr 10 22:43:47 2013 +0100 fix HTTP port at 5000 commit202ea4a84cAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Apr 10 22:33:03 2013 +0100 bug fixes in discover commit925d9e4d6bAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Apr 10 21:51:44 2013 +0100 add mini app for one-time jobs commitd3a6c08a9dAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Apr 10 21:46:55 2013 +0100 better name for subaction commit4adf473b20Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Apr 10 20:15:18 2013 +0100 add logging of db add/del commit8aacafedaaAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Apr 10 19:49:00 2013 +0100 copy all remaining messages from netdisco 1 commit3e1156df1fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 8 22:09:40 2013 +0100 alter some log levels and messages commite7ea92920fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 8 20:32:33 2013 +0100 store wireless ssid and port info to DB commitd1d16938a1Author: Oliver Gorwits <oliver@cpan.org> Date: Fri Apr 5 08:52:59 2013 +0100 update packaging for new files and deps commit965990786fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 22:22:50 2013 +0100 implementation of find_neighbors commit03c4d8ef09Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 20:42:11 2013 +0100 add discoverall and discover_neighbors poller jobs commitdf68ff0890Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 19:52:37 2013 +0100 implementation of store_modules commitc2ac19e647Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 19:32:14 2013 +0100 implementation of store_power commitb7fb8c64a0Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 18:48:09 2013 +0100 implementation of store_vlans commitb8ddbd1ecaAuthor: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 17:08:06 2013 +0100 implementation of store_wireless (without storing, yet) commit2a14057481Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 16:47:21 2013 +0100 implementation of store_interfaces (without wireless) commitd5b2b71d34Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 15:12:19 2013 +0100 only start Manager if there are pollers or interactives commitf4a3dac760Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 15:03:10 2013 +0100 change sub names so as not to collide with Dancer commita8f0894986Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 14:47:28 2013 +0100 implementation of refresh, discover, and store_device commit4c2e3cf82dAuthor: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 11:38:15 2013 +0100 make get_device return a new result object commite6ac131658Author: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 10:38:22 2013 +0100 better POD section name commit6c5b6bbbeeAuthor: Oliver Gorwits <oliver@cpan.org> Date: Thu Apr 4 10:37:46 2013 +0100 implement separate snmp_connect and snmp_connect_rw methods commit62c8e19063Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 1 20:06:29 2013 +0100 fix for unique constraint on job queue for locally queued jobs commitebb65996e6Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 1 20:00:36 2013 +0100 add refresh poller job commit05928e8cf6Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 1 19:31:39 2013 +0100 Refactor Util namespace Squashed commit of the following: commit789c528fcfAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 1 19:31:07 2013 +0100 update manifest and fix typo commitb95d0951f2Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Apr 1 19:22:41 2013 +0100 refactor ::Util namespace commita8dde50343Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 31 13:45:27 2013 +0100 no need to search for device - IP should already be exact commitb42daee4c1Merge:6e5276295bb8fcAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 27 21:00:09 2013 +0000 Merge branch 'master' into og-poller commit6e527629a2Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Mar 26 23:39:23 2013 +0000 fixes and log messages commitcfcb7a956fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Tue Mar 26 22:57:06 2013 +0000 bug fixes commit48f779a8d0Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Mar 26 22:42:16 2013 +0000 add config for scheduled tasks commit2f6efcb312Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Mar 26 22:15:04 2013 +0000 create poller worker and add poller type stubs commit52b28b0ab8Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Mar 26 22:04:00 2013 +0000 code tidy commit96db66739fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 25 22:35:11 2013 +0000 more insane but more working version of the job queue constraint commitcb25216f40Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 24 20:22:11 2013 +0000 make scheduler start automatic based on housekeeping setting existing commit0acbe8abd3Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 24 19:45:24 2013 +0000 add scheduler based on Algorithm::Cron commit49d136b57aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 24 18:48:10 2013 +0000 add unique constraint on admin/job queue
		
			
				
	
	
		
			123 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Perl
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			123 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Perl
		
	
	
		
			Executable File
		
	
	
	
	
| #!/usr/bin/env perl
 | |
| 
 | |
| use FindBin;
 | |
| FindBin::again();
 | |
| use Path::Class 'dir';
 | |
| 
 | |
| BEGIN {
 | |
|   # stuff useful locations into @INC
 | |
|   unshift @INC,
 | |
|     dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
 | |
|     dir($FindBin::RealBin, 'lib')->stringify;
 | |
| }
 | |
| 
 | |
| # for netdisco app config
 | |
| use App::Netdisco;
 | |
| use Dancer qw/:moose :script/;
 | |
| info "App::Netdisco version $App::Netdisco::VERSION daemon loaded.";
 | |
| 
 | |
| # callbacks and local job queue management
 | |
| use App::Netdisco::Daemon::Queue ':all';
 | |
| 
 | |
| # needed to quench AF_INET6 symbol errors
 | |
| use NetAddr::IP::Lite ':lower';
 | |
| 
 | |
| use Role::Tiny::With;
 | |
| use MCE::Signal '-setpgrp';
 | |
| use MCE;
 | |
| 
 | |
| # set temporary MCE files' location in home directory
 | |
| my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 | |
| my $tmp_dir = ($ENV{NETDISCO_TEMP} || dir($home, 'tmp'));
 | |
| mkdir $tmp_dir if ! -d $tmp_dir;
 | |
| 
 | |
| my $mce = MCE->new(
 | |
|   spawn_delay => 0.15,
 | |
|   job_delay   => 1.15,
 | |
|   tmp_dir     => $tmp_dir,
 | |
|   user_func    => sub { $_[0]->worker_body },
 | |
|   on_post_exit => \&restart_worker,
 | |
|   user_tasks   => build_tasks_list(),
 | |
| )->run();
 | |
| 
 | |
| sub build_tasks_list {
 | |
|   # NB MCE does not like max_workers => 0
 | |
|   my $tasks = [];
 | |
| 
 | |
|   set(daemon_pollers => 2)
 | |
|     if !defined setting('daemon_pollers');
 | |
|   set(daemon_interactives => 2)
 | |
|     if !defined setting('daemon_interactives');
 | |
| 
 | |
|   push @$tasks, {
 | |
|     max_workers => 1,
 | |
|     user_begin => worker_factory('Manager'),
 | |
|   } if setting('daemon_pollers') or setting('daemon_interactives');
 | |
| 
 | |
|   push @$tasks, {
 | |
|     max_workers => 1,
 | |
|     user_begin => worker_factory('Scheduler'),
 | |
|   } if setting('housekeeping');
 | |
| 
 | |
|   push @$tasks, {
 | |
|     max_workers => setting('daemon_pollers'),
 | |
|     user_begin => worker_factory('Poller'),
 | |
|   } if setting('daemon_pollers');
 | |
| 
 | |
|   push @$tasks, {
 | |
|     max_workers => setting('daemon_interactives'),
 | |
|     user_begin => worker_factory('Interactive'),
 | |
|   } if setting('daemon_interactives');
 | |
| 
 | |
|   info sprintf "MCE will load %s tasks: %s Manager, %s Scheduler, %s Poller, %s Interactive",
 | |
|     (scalar @$tasks),
 | |
|     ((setting('daemon_pollers') or setting('daemon_interactives')) ? 1 : 0),
 | |
|     (setting('housekeeping') ? 1 : 0),
 | |
|     (setting('daemon_pollers') || 0),
 | |
|     (setting('daemon_interactives') || 0);
 | |
| 
 | |
|   return $tasks;
 | |
| }
 | |
| 
 | |
| sub num_workers {
 | |
|   return (setting('daemon_pollers') + setting('daemon_interactives'));
 | |
| }
 | |
| 
 | |
| sub worker_factory {
 | |
|   my $role = shift;
 | |
|   return sub {
 | |
|     my $self = shift;
 | |
|     my $wid = $self->wid;
 | |
|     info "applying role $role to worker $wid";
 | |
| 
 | |
|     # $self->sendto('stderr', ">>> worker $wid starting with role $role\n");
 | |
|     Role::Tiny->apply_roles_to_object($self, "App::Netdisco::Daemon::Worker::$role");
 | |
| 
 | |
|     $self->worker_begin if $self->can('worker_begin');
 | |
|   };
 | |
| }
 | |
| 
 | |
| sub restart_worker {
 | |
|   my ($self, $e) = @_;
 | |
|   reset_jobs($e->{wid});
 | |
| 
 | |
|   debug "restarting worker $e->{wid}";
 | |
|   $self->restart_worker($e->{wid});
 | |
| }
 | |
| 
 | |
| =head1 NAME
 | |
| 
 | |
| netdisco-daemon-fg - Job Control for Netdisco
 | |
| 
 | |
| =head1 SEE ALSO
 | |
| 
 | |
| =over 4
 | |
| 
 | |
| =item *
 | |
| 
 | |
| L<App::Netdisco>
 | |
| 
 | |
| =back
 | |
| 
 | |
| =cut
 |