| 1 |
jcrisp |
1.1 |
diff -ruN smeserver-affa-3.3.1.old/root/sbin/affa smeserver-affa-3.3.1/root/sbin/affa |
| 2 |
|
|
--- smeserver-affa-3.3.1.old/root/sbin/affa 2022-06-30 15:14:52.658789181 +0100 |
| 3 |
|
|
+++ smeserver-affa-3.3.1/root/sbin/affa 2022-06-30 15:21:11.491094054 +0100 |
| 4 |
|
|
@@ -727,18 +727,19 @@ |
| 5 |
|
|
$rpt->newval( 'Report', 'Date', Date::Format::time2str( "%Y%m%d%H%M", time() ) ); |
| 6 |
|
|
$rpt->newval( 'Report', 'ExecutionTime', time() - $StartTime ); |
| 7 |
|
|
foreach my $s ( split( /[\r\n]/, $rsyncOutput ) ) { |
| 8 |
|
|
- next if ( $s =~ /(^rsync)|(^sent)|(^total size is)|(^File list)/ ); |
| 9 |
|
|
- my @p = split( /:/, $s ); |
| 10 |
|
|
- ( my $key = $p[0] ) =~ s/\b(\w)/\U$1/g; # first char uppercase |
| 11 |
|
|
- $key =~ s/ //g; |
| 12 |
|
|
- ( my $val = trim( $p[1] ) ) =~ s/ .*$//; |
| 13 |
|
|
- |
| 14 |
|
|
-#### ajout AG pour enlever les virgules générées par rsync3 |
| 15 |
|
|
- $val =~ s/,//g; |
| 16 |
|
|
-##### fin des modifs AG |
| 17 |
|
|
- |
| 18 |
|
|
- $rpt->newval( 'Report', $key, $val ); |
| 19 |
|
|
+ if ( $s =~ /^(rsync|sent|total size is|File list)/ ){ |
| 20 |
|
|
+ my @p = split( /:/, $s ); |
| 21 |
|
|
+ ( my $key = $p[0] ) =~ s/\b(\w)/\U$1/g; # first char uppercase |
| 22 |
|
|
+ $key =~ s/ //g; |
| 23 |
|
|
+ ( my $val = trim( $p[1] ) ) =~ s/ .*$//; |
| 24 |
|
|
+ #### ajout AG pour enlever les virgules générées par rsync3 |
| 25 |
|
|
+ #### Remove commas generated by Rsync 3 |
| 26 |
|
|
+ $val =~ s/,//g; |
| 27 |
|
|
+ ##### fin des modifs AG |
| 28 |
|
|
+ $rpt->newval( 'Report', $key, $val ); |
| 29 |
|
|
+ } |
| 30 |
|
|
} |
| 31 |
|
|
+ |
| 32 |
|
|
$rpt->newval( 'Report', 'RootDirFilesystemUsed', $used ); # kbytes |
| 33 |
|
|
$rpt->newval( 'Report', 'RootDirFilesystemAvail', $avail ); # kbytes |
| 34 |
|
|
$rpt->newval( 'Report', 'RootDirFilesystemUsage', sprintf( '%.1f', $used / ( $avail + $used ) * 100 ) ) |
Parent Directory
| 
Revision Log
| 
Revision Graph
