frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Handle empty credentials file

Browse Source 
Closes #937
This commit is contained in:
Nick O'Leary 2016-07-26 22:23:49 +01:00
parent d944298dd7
commit d6b326c134
2 changed files with 59 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
red/runtime/locales/en-US/runtime.json
View File

@ -121,11 +121,11 @@
"localfilesystem": { "localfilesystem": {
"user-dir": "User directory : __path__", "user-dir": "User directory : __path__",
"flows-file": "Flows file : __path__", "flows-file": "Flows file : __path__",
"create": "Creating new flow file", "create": "Creating new __type__ file",
"empty": "Existing flow file is empty", "empty": "Existing __type__ file is empty",
"invalid": "Existing flow file is not valid json", "invalid": "Existing __type__ file is not valid json",
"restore": "Restoring flow file backup : __path__", "restore": "Restoring __type__ file backup : __path__",
"restore-fail": "Restoring flow file backup failed : __message__" "restore-fail": "Restoring __type__ file backup failed : __message__"
} }
} }
} }

115
red/runtime/storage/localfilesystem.js
View File

@ -122,6 +122,53 @@ function writeFile(path,content) {
}); });
} }
function readFile(path,backupPath,emptyResponse,type) {
return when.promise(function(resolve) {
fs.readFile(path,'utf8',function(err,data) {
if (!err) {
if (data.length === 0) {
log.warn(log._("storage.localfilesystem.empty",{type:type}));
try {
var backupStat = fs.statSync(backupPath);
if (backupStat.size === 0) {
// Empty flows, empty backup - return empty flow
return resolve(emptyResponse);
}
// Empty flows, restore backup
log.warn(log._("storage.localfilesystem.restore",{path:backupPath,type:type}));
fs.copy(backupPath,path,function(backupCopyErr) {
if (backupCopyErr) {
// Restore backup failed
log.warn(log._("storage.localfilesystem.restore-fail",{message:backupCopyErr.toString(),type:type}));
resolve([]);
} else {
// Loop back in to load the restored backup
resolve(readFile(path,backupPath,emptyResponse,type));
}
});
return;
} catch(backupStatErr) {
// Empty flow file, no back-up file
return resolve(emptyResponse);
}
}
try {
return resolve(JSON.parse(data));
} catch(parseErr) {
log.warn(log._("storage.localfilesystem.invalid",{type:type}));
return resolve(emptyResponse);
}
} else {
if (type === 'flow') {
log.info(log._("storage.localfilesystem.create",{type:type}));
}
resolve(emptyResponse);
}
});
});
}
var localfilesystem = { var localfilesystem = {
init: function(_settings) { init: function(_settings) {
settings = _settings; settings = _settings;
@ -191,52 +238,12 @@ var localfilesystem = {
}, },
getFlows: function() { getFlows: function() {
return when.promise(function(resolve) { if (!initialFlowLoadComplete) {
if (!initialFlowLoadComplete) { initialFlowLoadComplete = true;
initialFlowLoadComplete = true; log.info(log._("storage.localfilesystem.user-dir",{path:settings.userDir}));
log.info(log._("storage.localfilesystem.user-dir",{path:settings.userDir})); log.info(log._("storage.localfilesystem.flows-file",{path:flowsFullPath}));
log.info(log._("storage.localfilesystem.flows-file",{path:flowsFullPath})); }
} return readFile(flowsFullPath,flowsFileBackup,[],'flow');
fs.readFile(flowsFullPath,'utf8',function(err,data) {
if (!err) {
if (data.length === 0) {
log.warn(log._("storage.localfilesystem.empty"));
try {
var backupStat = fs.statSync(flowsFileBackup);
if (backupStat.size === 0) {
// Empty flows, empty backup - return empty flow
return resolve([]);
}
// Empty flows, restore backup
log.warn(log._("storage.localfilesystem.restore",{path:flowsFileBackup}));
fs.copy(flowsFileBackup,flowsFullPath,function(backupCopyErr) {
if (backupCopyErr) {
// Restore backup failed
log.warn(log._("storage.localfilesystem.restore-fail",{message:backupCopyErr.toString()}));
resolve([]);
} else {
// Loop back in to load the restored backup
resolve(localfilesystem.getFlows());
}
});
return;
} catch(backupStatErr) {
// Empty flow file, no back-up file
return resolve([]);
}
}
try {
return resolve(JSON.parse(data));
} catch(parseErr) {
log.warn(log._("storage.localfilesystem.invalid"));
return resolve([]);
}
} else {
log.info(log._("storage.localfilesystem.create"));
resolve([]);
}
});
});
}, },
saveFlows: function(flows) { saveFlows: function(flows) {
@ -260,21 +267,7 @@ var localfilesystem = {
}, },
getCredentials: function() { getCredentials: function() {
return when.promise(function(resolve) { return readFile(credentialsFile,credentialsFileBackup,{},'credentials');
fs.readFile(credentialsFile,'utf8',function(err,data) {
if (!err) {
resolve(JSON.parse(data));
} else {
fs.readFile(oldCredentialsFile,'utf8',function(err,data) {
if (!err) {
resolve(JSON.parse(data));
} else {
resolve({});
}
});
}
});
});
}, },
saveCredentials: function(credentials) { saveCredentials: function(credentials) {