Fix persistence filter initialization
This commit is contained in:
@@ -35,7 +35,7 @@ class AntiEtcdAdapter
|
|||||||
ip: selected[0][0],
|
ip: selected[0][0],
|
||||||
port: selected[0][1],
|
port: selected[0][1],
|
||||||
data: config.antietcd_data_file || ((config.antietcd_data_dir || '/var/lib/vitastor') + '/mon_'+selected[0][1]+'.json.gz'),
|
data: config.antietcd_data_file || ((config.antietcd_data_dir || '/var/lib/vitastor') + '/mon_'+selected[0][1]+'.json.gz'),
|
||||||
persist_filter: vitastor_persist_filter(config.etcd_prefix || '/vitastor'),
|
persist_filter: vitastor_persist_filter({ vitastor_prefix: config.etcd_prefix || '/vitastor' }),
|
||||||
node_id: selected[0][0]+':'+selected[0][1], // node_id = ip:port
|
node_id: selected[0][0]+':'+selected[0][1], // node_id = ip:port
|
||||||
cluster: (cluster.length == 1 ? null : cluster.reduce((a, c) => { a[c] = "http://"+c; return a; }, {})),
|
cluster: (cluster.length == 1 ? null : cluster.reduce((a, c) => { a[c] = "http://"+c; return a; }, {})),
|
||||||
cluster_key: (config.etcd_prefix || '/vitastor'),
|
cluster_key: (config.etcd_prefix || '/vitastor'),
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ function vitastor_persist_filter(cfg)
|
|||||||
catch (e)
|
catch (e)
|
||||||
{
|
{
|
||||||
console.error('invalid JSON in '+key+' = '+value+': '+e);
|
console.error('invalid JSON in '+key+' = '+value+': '+e);
|
||||||
value = {};
|
value = '{}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user