-dhcp plugin returns a more specific error message when ambiguous dynamic range ownership detected
-xCATd now logs startup, explicitly blocks the 'cons' syslog backend, and exits out if syslog unable to provide a suitable logging situation (cons forked if things were that bad and broke DB handles, syslogd needs to run anyway) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@888 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -216,7 +216,7 @@ sub preprocess_request { | ||||
|       if ($ntab) { | ||||
|          foreach (@{$ntab->getAllEntries()}) { | ||||
|             if ($_->{dynamicrange} and not $_->{dhcpserver}) { | ||||
|                $callback->({error=>["In a hierachy, network entries with a dynamic range must be explicit in the dhcpserver field"],errorcode=>[1]}); | ||||
|                $callback->({error=>["Hierarchy requested, therefore networks.dhcpserver must be set for net=".$_->{net}.""],errorcode=>[1]}); | ||||
|                return []; | ||||
|             } | ||||
|          } | ||||
|   | ||||
| @@ -35,7 +35,8 @@ $XML::Simple::PREFERRED_PARSER='XML::Parser'; | ||||
| use xCAT::Table; | ||||
| use Data::Dumper; | ||||
| use Getopt::Long; | ||||
| use Sys::Syslog; | ||||
| use Sys::Syslog qw(:DEFAULT setlogsock); | ||||
| setlogsock([qw(native,tcp,udp,unix,stream)]); | ||||
| use xCAT::NotifHandler; | ||||
| use xCAT_monitoring::monitorctrl; | ||||
|  | ||||
| @@ -340,6 +341,13 @@ sub scan_plugins { | ||||
|   } | ||||
| } | ||||
| scan_plugins; | ||||
| eval { | ||||
|    syslog("local4|info","xCATd: service starting"); | ||||
| }; | ||||
| if ($@) { | ||||
|    print "ERROR: $@"; | ||||
|    exit; | ||||
| } | ||||
| unless ($foreground) { | ||||
|    daemonize; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user