coolaj86/telebit.js
1
2
Fork 1
Code Issues 48 Pull Requests 3 Releases Activity

MAJOR: Updates for Authenticated Web UI and CLI #30

Open
coolaj86 wants to merge 77 commits from next into master
pull from: next
merge into: coolaj86:master
Conversation 0 Commits 77 Files Changed 28 +11 -8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 75f538fa16 - Show all commits

6
bin/telebit-remote.js
View File

@ -306,8 +306,8 @@ var RC;
function parseConfig(err, text) { function parseConfig(err, text) {
function handleConfig(err, config) { function handleConfig(err, config) {
//console.log('CONFIG'); if (err) { throw err; }
//console.log(config);
state.config = config; state.config = config;
var verstrd = [ pkg.name + ' daemon v' + state.config.version ]; var verstrd = [ pkg.name + ' daemon v' + state.config.version ];
if (state.config.version && state.config.version !== pkg.version) { if (state.config.version && state.config.version !== pkg.version) {
@ -652,7 +652,7 @@ function parseConfig(err, text) {
}); });
} }
RC.request({ service: 'config', method: 'GET' }, handleRemoteRequest('config', handleConfig)); RC.request({ service: 'config', method: 'GET' }, handleConfig);
} }
var parsers = { var parsers = {

5
lib/rc/index.js
View File

@ -39,16 +39,19 @@ module.exports.create = function (state) {
var err; var err;
if (200 !== resp.statusCode) { if (200 !== resp.statusCode) {
err = new Error(body || ('get' + service + ' failed')); err = new Error(body || ('get ' + service + ' failed'));
err.statusCode = resp.statusCode; err.statusCode = resp.statusCode;
err.code = "E_REQUEST"; err.code = "E_REQUEST";
} }
if (body) {
try { try {
body = JSON.parse(body); body = JSON.parse(body);
} catch(e) { } catch(e) {
console.error('Error:', err);
// ignore // ignore
} }
}
fn(err, body); fn(err, body);
} }