tidy up Route, add argument to sh/ver

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1e8200d2e0d03949a4d46dd1b209ab5d9c54e0a9..18460f14298a942753c7abba3025e892427ec4d6 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -89,9 +89,12 @@ 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 DXDebug;
 use Msg;
 use IntMsg;
 use Internet;
@@ -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();