Page MenuHomePhabricator
Files F7159420

No OneTemporary
Actions

View Options

diff --git a/scripts/importRatingTables.php b/scripts/importRatingTables.php
index 2527ee1..0672369 100755
--- a/scripts/importRatingTables.php
+++ b/scripts/importRatingTables.php
@@ -1,32 +1,32 @@
#!/usr/bin/env php
<?php
require("/etc/cdrtool/global.inc");
require('cdr_generic.php');
require("rating.php");
set_time_limit(0);
$lockFile = sprintf("/var/lock/CDRTool_import_rates.lock");
$abort_text = "Another import operation is in progress. Try again later.\n";
$f = fopen($lockFile, "w");
if (flock($f, LOCK_EX + LOCK_NB, $w)) {
if ($w) {
print $abort_text;
syslog(LOG_NOTICE, $abort_text);
exit(2);
}
} else {
print $abort_text;
syslog(LOG_NOTICE, $abort_text);
exit(1);
}
-$RatingTables= new RatingTables();
+$RatingTables = new RatingTables();
$RatingTables->ImportCSVFiles();
if ($RatingTables->mustReload) {
if (!reloadRatingEngineTables()) {
print "Error: cannot connect to network rating engine\n";
}
}
diff --git a/scripts/normalize.php b/scripts/normalize.php
index 957c31b..d0a0820 100755
--- a/scripts/normalize.php
+++ b/scripts/normalize.php
@@ -1,110 +1,110 @@
#!/usr/bin/env php
<?php
set_time_limit(0);
require("/etc/cdrtool/global.inc");
require("cdr_generic.php");
require("rating.php");
$lockFile = "/var/lock/CDRTool_normalize.lock";
if ($argv[1]) {
if (preg_match("/^\d{4}\d{2}$/", $argv[1], $m)) {
$table = 'radacct'.$argv[1];
} else {
die("Error: Month must be in YYYYMM format\n");
}
}
-if ($f=fopen($lockFile, "w")) {
+if ($f = fopen($lockFile, "w")) {
if (flock($f, LOCK_EX + LOCK_NB, $w)) {
if ($w) {
print "Another CDRTool normalization is in progress. Aborting.\n";
syslog(LOG_NOTICE, "Another CDRTool normalization is in progress. Aborting.");
exit(2);
}
} else {
print "Another CDRTool normalization is in progress. Aborting.\n";
syslog(LOG_NOTICE, "Another CDRTool normalization is in progress. Aborting.");
exit(1);
}
} else {
- $log=sprintf("Error: Cannot open lock file %s for writing\n", $lockFile);
+ $log = sprintf("Error: Cannot open lock file %s for writing\n", $lockFile);
print $log;
syslog(LOG_NOTICE, $log);
exit(2);
}
while (list($k,$v) = each($DATASOURCES)) {
if (strlen($v["normalizedField"] and !$v["skipNormalize"])) {
$b = time();
$class_name = $v["class"];
unset($CDRS);
$CDRS = new $class_name($k);
if (is_array($CDRS->db_class)) {
$db_class = $CDRS->db_class[0];
} else {
$db_class = $CDRS->db_class;
}
- if ($table) $CDRS->table=$table;
+ if ($table) $CDRS->table = $table;
$log = sprintf("Normalize datasource %s, database %s, table %s\n", $k, $db_class, $CDRS->table);
print $log;
syslog(LOG_NOTICE, $log);
$CDRS->NormalizeCDRS();
- $e=time();
- $d=$e-$b;
+ $e = time();
+ $d = $e - $b;
if ($CDRS->status['cdr_to_normalize']) {
- $speed=0;
+ $speed = 0;
if ($d) $speed = number_format($CDRS->status['cdr_to_normalize']/$d, 0, "", "");
$log = sprintf(
" %d CDRs, %d normalized in %s s @ %s cps\n",
$CDRS->status['cdr_to_normalize'],
$CDRS->status['normalized'],
$d,
$speed
);
print $log;
syslog(LOG_NOTICE, $log);
}
if (!$table && preg_match("/^(\w+)\d{6}$/", $CDRS->table, $m)) {
$lastMonthTable=$m[1].date('Ym', mktime(0, 0, 0, date("m")-1, "01", date("Y")));
$log = sprintf("Normalize datasource %s, database %s, table %s\n", $k, $db_class, $lastMonthTable);
print $log;
syslog(LOG_NOTICE, $log);
- $b=time();
+ $b = time();
$CDRS->table = $lastMonthTable;
$CDRS->NormalizeCDRS();
if ($CDRS->status['cdr_to_normalize']) {
- $e=time();
- $d=$e-$b;
+ $e = time();
+ $d = $e - $b;
- $speed=0;
+ $speed = 0;
if ($d) $speed = number_format($CDRS->status['cdr_to_normalize']/$d, 0, "", "");
$log = sprintf(
" %d CDRs, %d normalized in %s s @ %s cps\n",
$CDRS->status['cdr_to_normalize'],
$CDRS->status['normalized'],
$d,
$speed
);
print $log;
syslog(LOG_NOTICE, $log);
}
}
}
}
keepAliveRatingEngine();

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 23, 5:49 AM (1 d, 2 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3408863
Default Alt Text
(4 KB)

Event Timeline