Subversion Repositories DevTools

Rev

Rev 1050 | Rev 3515 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1050 Rev 1289
Line 138... Line 138...
138
#
138
#
139
# Description     : Re read the config file if it modification time has changed
139
# Description     : Re read the config file if it modification time has changed
140
#
140
#
141
# Inputs          : Nothing
141
# Inputs          : Nothing
142
#
142
#
143
# Returns         : Nothing
143
# Returns         : 0       - Config not read
-
 
144
#                   1       - Config read
-
 
145
#                             Config file has changed
144
#
146
#
145
sub readConfig
147
sub readConfig
146
{
148
{
147
    my ($mtime) = Utils::mtime($ARGV[0]);
149
    my ($mtime) = Utils::mtime($ARGV[0]);
-
 
150
    my $rv = 0;
-
 
151
 
148
    if ( $mtimeConfig != $mtime )
152
    if ( $mtimeConfig != $mtime )
149
    {
153
    {
150
        $logger->logmsg("Reading config file: $ARGV[0]");
154
        $logger->logmsg("Reading config file: $ARGV[0]");
151
        $mtimeConfig = $mtime;
155
        $mtimeConfig = $mtime;
152
        my $errors;
156
        my $errors;
Line 198... Line 202...
198
        #   When config is read force some actions
202
        #   When config is read force some actions
199
        #       - Force tagList to be created
203
        #       - Force tagList to be created
200
        #       - Force release scan
204
        #       - Force release scan
201
        $lastTagListScan = 0;
205
        $lastTagListScan = 0;
202
        $lastReleaseScan = 0;
206
        $lastReleaseScan = 0;
203
        
207
        $rv = 1;
204
    }
208
    }
-
 
209
    return $rv;
205
}
210
}
206
 
211
 
207
 
212
 
208
#-------------------------------------------------------------------------------
213
#-------------------------------------------------------------------------------
209
# Function        : processReleaseList
214
# Function        : processReleaseList
Line 547... Line 552...
547
            {
552
            {
548
                $logger->warn("Max transfer count exceeded: $needPkgListCount transfer remaining");
553
                $logger->warn("Max transfer count exceeded: $needPkgListCount transfer remaining");
549
                $lastReleaseScan = 0;
554
                $lastReleaseScan = 0;
550
                last send_pkgs;
555
                last send_pkgs;
551
            }
556
            }
-
 
557
 
-
 
558
            if ( readConfig() )
-
 
559
            {
-
 
560
                $logger->warn("Config file changed");
-
 
561
                $lastReleaseScan = 0;
-
 
562
                $txcount = 0;
-
 
563
                last send_pkgs;
-
 
564
            }
-
 
565
 
552
            transferPackage ($pname, $pver, $pdata);
566
            transferPackage ($pname, $pver, $pdata);
553
            $needPkgListCount--;
567
            $needPkgListCount--;
554
        }
568
        }
555
    }
569
    }
556
 
570
 
Line 566... Line 580...
566
            {
580
            {
567
                $logger->warn("Max transfer count exceeded: $excessPkgListCount deletion remaining");
581
                $logger->warn("Max transfer count exceeded: $excessPkgListCount deletion remaining");
568
                $lastReleaseScan = 0;
582
                $lastReleaseScan = 0;
569
                last delete_pkgs;
583
                last delete_pkgs;
570
            }
584
            }
-
 
585
 
-
 
586
            if ( readConfig() )
-
 
587
            {
-
 
588
                $logger->warn("Config file changed");
-
 
589
                $lastReleaseScan = 0;
-
 
590
                $txcount = 0;
-
 
591
                last send_pkgs;
-
 
592
            }
-
 
593
            
571
            deletePackage ($pname, $pver, $pdata);
594
            deletePackage ($pname, $pver, $pdata);
572
            $excessPkgListCount--;
595
            $excessPkgListCount--;
573
        }
596
        }
574
    }
597
    }
575
 
598