X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=18460f14298a942753c7abba3025e892427ec4d6;hb=f11237c455a6440b5158206dcb2d03850ed1b7b0;hp=1c7466a8a2a59f18581a1501b0d1304210abd2d4;hpb=0de1a272bd43c887020d9e03a4f56f44ab4bb080;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1c7466a8..18460f14 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -89,6 +89,10 @@ use SysVar;
 
 use strict;
 
+# order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log
+use DXDebug;
+
+use Mojolicious 7.26;
 use Mojo::IOLoop;
 
 use Msg;
@@ -98,7 +102,6 @@ use Listeners;
 use ExtMsg;
 use AGWConnect;
 use AGWMsg;
-use DXDebug;
 use DXLog;
 use DXLogPrint;
 use DXUtil;
@@ -144,6 +147,8 @@ use DXSql;
 use IsoTime;
 use BPQMsg;
 
+
+
 use Data::Dumper;
 use IO::File;
 use Fcntl ':flock';
@@ -455,6 +460,9 @@ sub setup_start
 				my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
 				if ($desc) {
 					my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+					$s ||= '';
+					dbg("Git: $desc");
+					dbg("Git: V=$v S=$s B=$b g=$g");
 					$version = $v;
 					$build = $b || 0;
 					$gitversion = "$g\[r]";
@@ -632,6 +640,8 @@ our $io_disconnected;
 sub idle_loop
 {
 	BPQMsg::process();
+#	DXCommandmode::process(); # process ongoing command mode stuff
+#	DXProt::process();		# process ongoing ak1a pcxx stuff
 
 	if (defined &Local::process) {
 		eval {
@@ -676,10 +686,10 @@ sub per_sec
 		$systime_daystart = $days * 86400;
 	}
 	IsoTime::update($systime);
-	DXCron::process();      # do cron jobs
 	DXCommandmode::process(); # process ongoing command mode stuff
-	DXXml::process();
 	DXProt::process();		# process ongoing ak1a pcxx stuff
+	DXCron::process();      # do cron jobs
+	DXXml::process();
 	DXConnect::process();
 	DXMsg::process();
 	DXDb::process();
@@ -687,7 +697,6 @@ sub per_sec
 	DXDupe::process();
 	DXCron::process();			# do cron jobs
 	IsoTime::update($systime);
-	DXProt::process();			# process ongoing ak1a pcxx stuff
 	DXConnect::process();
 	DXUser::process();
 	AGWMsg::process();