Kaynağa Gözat

moved MAC ONU messages to stdout log

alakiza 2 yıl önce
ebeveyn
işleme
d328911948
3 değiştirilmiş dosya ile 18 ekleme ve 4 silme
  1. 1 0
      djinn.pl
  2. 8 2
      modules/bdcom.pm
  3. 9 2
      modules/cdata.pm

+ 1 - 0
djinn.pl

@@ -24,6 +24,7 @@ use lib "$Bin/modules";
 use darsan_auth;
 use darsan_client;
 
+our $log = Mojo::Log->new;
 our %aliases;
 
 use alias;

+ 8 - 2
modules/bdcom.pm

@@ -6,6 +6,8 @@ use telnet;
 use Mojo::AsyncAwait;
 use Data::Dumper;
 
+our $log;
+
 sub bdcom_extract_onu_num {
     my $onu_name = shift;
 
@@ -225,7 +227,9 @@ async bdcom_purge => sub
 Лучше обратиться к Вашему системному администратору\n";
     }
 
-    $res = $res . "Удалённые ONU:\n" . join("\n", @deleted_onu) if @deleted_onu > 0;
+    $res = $res . "Удалённые ONU: " . scalar @deleted_onu . "\n";
+
+    $log->info("IP $ip TREE $tree\n" . join("\n", @deleted_onu));
 
     return $res;
 };
@@ -266,7 +270,9 @@ async bdcom_purgeall => sub
         %onu_info = await bdcom_get_onu_info($t, $tree);
 
         $res = $res . "Осталось ONU: $onu_info{'total_cnt'}\n";
-        $res = $res . "Удалённые ONU:\n" . join("\n", @deleted_onu) if @deleted_onu > 0;
+        $res = $res . "Удалённые ONU: " . scalar @deleted_onu . "\n";
+
+        $log->info("IP $ip TREE $tree\n" . join("\n", @deleted_onu));
 
         push @res, $res;
 

+ 9 - 2
modules/cdata.pm

@@ -6,6 +6,8 @@ use telnet;
 use Mojo::AsyncAwait;
 use Data::Dumper;
 
+our $log;
+
 sub cdata_extract_onu_info {
     my @lines = @_;
 
@@ -197,7 +199,10 @@ async cdata_purge => sub
 Лучше обратиться к Вашему системному администратору\n";
     }
 
-    $res = $res . "Удалённые ONU:\n" . join("\n", @deleted_onu) if @deleted_onu > 0;
+    $res = $res . "Удалённые ONU: " . scalar @deleted_onu . "\n";
+
+    $log->info("IP $ip TREE $tree\n" . join("\n", @deleted_onu));
+
 
     return $res;
 };
@@ -237,7 +242,9 @@ async cdata_purgeall => sub
         %onu_info = await cdata_get_onu_info($t, $tree);
 
         $res = $res . "Осталось ONU: $onu_info{'total_cnt'}\n";
-        $res = $res . "Удалённые ONU:\n" . join("\n", @deleted_onu) if @deleted_onu > 0;
+        $res = $res . "Удалённые ONU: " . scalar @deleted_onu . "\n";
+
+        $log->info("IP $ip TREE $tree\n" . join("\n", @deleted_onu));
 
         push @res, $res;