Skip to content

Commit 312e8c8

Browse files
committed
Fix #20
1 parent 5477969 commit 312e8c8

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

libexec/NfConf.pm

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ sub LoadConfig {
149149
$MAIL_BODY = q{Alert '@alert@' triggered at timeslot @timeslot@};
150150
$SMTP_SERVER = '';
151151

152-
$ZIPcollected = 1;
153-
$ZIPprofiles = 1;
152+
$ZIPcollected = "-z=lz4";
153+
$ZIPprofiles = "-z=lz4";
154154
$InterruptExpire = 0;
155155

156156
$NFPROFILEOPTS = '';
@@ -232,13 +232,15 @@ sub LoadConfig {
232232

233233
if ( !defined $ZIPprofiles ) {
234234
$ZIPprofiles = "";
235-
}
236-
237-
if ( looks_like_number($ZIPprofiles)) {
235+
} elsif ( looks_like_number($ZIPprofiles)) {
236+
# in case $ZIPprofiles = 1;
238237
$ZIPprofiles = "-z=lz4";
239238
}
240239

241-
if ( looks_like_number($ZIPcollected)) {
240+
if ( !defined $ZIPcollected ) {
241+
$ZIPcollected = "";
242+
} elsif ( looks_like_number($ZIPcollected)) {
243+
# in case $ZIPcollected = 1;
242244
$ZIPcollected = "-z=lz4";
243245
}
244246

libexec/NfProfile.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ sub ProfileHistory {
915915

916916
my $profilepath = ProfilePath($name, $group);
917917
my $subdirlayout = $NfConf::SUBDIRLAYOUT ? "-S $NfConf::SUBDIRLAYOUT" : "";
918-
my $arg = "-I -p $NfConf::ZIPprofiles $NfConf::PROFILEDATADIR -P $NfConf::PROFILESTATDIR $subdirlayout ";
918+
my $arg = "-I $NfConf::ZIPprofiles -p $NfConf::PROFILEDATADIR -P $NfConf::PROFILESTATDIR $subdirlayout ";
919919

920920
# create argument list specific for each channel
921921
# at the moment this contains of all channels in a continuous profile
@@ -1371,7 +1371,7 @@ sub DoRebuild {
13711371
}
13721372
my $channellist = join ':', keys %{$liveprofile{'channel'}};
13731373
my $subdirlayout = $NfConf::SUBDIRLAYOUT ? "-S $NfConf::SUBDIRLAYOUT" : "";
1374-
my $arg = "-I -p $NfConf::ZIPprofiles $NfConf::PROFILEDATADIR -P $NfConf::PROFILESTATDIR $subdirlayout ";
1374+
my $arg = "-I $NfConf::ZIPprofiles -p $NfConf::PROFILEDATADIR -P $NfConf::PROFILESTATDIR $subdirlayout ";
13751375

13761376
# profile missing slots
13771377
if ( $t <= $tend ) {

0 commit comments

Comments
 (0)