Fixed cluster_id in adb-rimo-import-broker
This commit is contained in:
@@ -99,10 +99,10 @@ $jobs = [];
|
|||||||
$clusters = loadClusters();
|
$clusters = loadClusters();
|
||||||
|
|
||||||
|
|
||||||
foreach($clusters as $cluster) {
|
foreach($clusters as $source_id => $cluster) {
|
||||||
$proc = [
|
$proc = [
|
||||||
"cluster" => $cluster["cluster"],
|
"cluster" => $cluster["cluster"],
|
||||||
"cluster_id" => $cluster["cluster"]->id,
|
"cluster_id" => $source_id,
|
||||||
"apiOwner" => $cluster["apiOwner"],
|
"apiOwner" => $cluster["apiOwner"],
|
||||||
"apiUrl" => $cluster["apiUrl"],
|
"apiUrl" => $cluster["apiUrl"],
|
||||||
"apiToken" => $cluster["apiKey"],
|
"apiToken" => $cluster["apiKey"],
|
||||||
@@ -110,7 +110,7 @@ foreach($clusters as $cluster) {
|
|||||||
"processtitle" => "ADB Import ".$cluster["cluster"]->name,
|
"processtitle" => "ADB Import ".$cluster["cluster"]->name,
|
||||||
"start" => false,
|
"start" => false,
|
||||||
];
|
];
|
||||||
$jobs[$cluster["cluster"]->id] = $proc;
|
$jobs[$source_id] = $proc;
|
||||||
}
|
}
|
||||||
|
|
||||||
$all_procs = $jobs;
|
$all_procs = $jobs;
|
||||||
@@ -302,7 +302,7 @@ function loadClusters() {
|
|||||||
if(!in_array($netzgebiet->source, $valid_adb_sources)) continue;
|
if(!in_array($netzgebiet->source, $valid_adb_sources)) continue;
|
||||||
|
|
||||||
if(!array_key_exists($netzgebiet->source_id, $clusters)) {
|
if(!array_key_exists($netzgebiet->source_id, $clusters)) {
|
||||||
$netzgebiet->id = $netzgebiet->source_id;
|
//$netzgebiet->id = $netzgebiet->source_id;
|
||||||
$clusters[$netzgebiet->source_id] = ["apiOwner" => $apiOwner, "apiKey" => $apiToken, "apiUrl" => $apiUrl, "cluster" => $netzgebiet];
|
$clusters[$netzgebiet->source_id] = ["apiOwner" => $apiOwner, "apiKey" => $apiToken, "apiUrl" => $apiUrl, "cluster" => $netzgebiet];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user