Merge pull request #21 from gshively11/parsers

Extended parsing on HAProxy.prototype.parse.

Author: 3rd-Eden

index.js

@@ -205,6 +205,12 @@ HAProxy.prototype.parse = function parse(using, buffer, fn, command) {
       delete row[''];
       return row;
     });
+  } else if (using === 'string') {
+    result = buffer.toString();
+  } else if (using === 'array') {
+    result = buffer.split('\n').map(function (line) { return line.trim(); });
+  } else if (typeof using === 'function') {
+    result = using(buffer);
   } else if (~buffer.indexOf('\n')) {
     result = buffer.split('\n').reduce(function reducer(data, line) {
       line = line.trim();
@@ -217,9 +223,12 @@ HAProxy.prototype.parse = function parse(using, buffer, fn, command) {
       //
       if ('object' === using) {
         var kv = line.split(':');
-
-        kv[1] = kv[1].trim();
-        data[kv[0]] = !isNaN(+kv[1]) ? +kv[1] : kv[1];
+        if(kv.length === 1) {
+          data[kv[0]] = '';
+        } else {
+          kv[1] = kv[1].trim();
+          data[kv[0]] = !isNaN(+kv[1]) ? +kv[1] : kv[1];
+        }
       }
 
       return data;

test/fixtures/index.js

@@ -22,6 +22,7 @@ module.exports = {
   'show info': read('showinfo'),
   'show stat': read('showstat'),
   'show stat -1 -1 -1': read('showstatall'),
+  'show stat parsed': require('./showstat-parsed'),
   'show sess': read('showsess'),
 
   'clear counters': read('empty'),

test/fixtures/showstat-parsed.js

@@ -0,0 +1,240 @@
+// showinfo.out that's been run through the parser
+
+module.exports = {
+  func: '# pxn',
+  string: '# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,\npublic,FRONTEND,,,27,81,2000,21994,33421405,32806329,0,0,0,,,,,OPEN,,,,,,,,,1,2,0,,,,0,195,0,538,,,,21967,0,0,0,0,0,,194,540,21992,,,0,0,0,0,\nrealtime,node1,0,0,25,77,32768,21992,33421405,32806329,,0,,0,0,0,0,no check,1,1,0,,,,,,1,3,1,,21992,,2,194,,540,,,,21991,0,0,0,0,0,0,,,,0,0,,,,,\nrealtime,BACKEND,0,0,25,77,200,21992,33421405,32806329,0,0,,0,0,0,0,UP,1,1,0,,0,648,0,,1,3,0,,21992,,1,194,,540,,,,21967,0,0,0,0,0,,,,,0,0,0,0,0,0,\n\n',
+  array: [
+    '# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,',
+    'public,FRONTEND,,,27,81,2000,21994,33421405,32806329,0,0,0,,,,,OPEN,,,,,,,,,1,2,0,,,,0,195,0,538,,,,21967,0,0,0,0,0,,194,540,21992,,,0,0,0,0,',
+    'realtime,node1,0,0,25,77,32768,21992,33421405,32806329,,0,,0,0,0,0,no check,1,1,0,,,,,,1,3,1,,21992,,2,194,,540,,,,21991,0,0,0,0,0,0,,,,0,0,,,,,',
+    'realtime,BACKEND,0,0,25,77,200,21992,33421405,32806329,0,0,,0,0,0,0,UP,1,1,0,,0,648,0,,1,3,0,,21992,,1,194,,540,,,,21967,0,0,0,0,0,,,,,0,0,0,0,0,0,',
+    '',
+    ''
+  ],
+  obj: {},
+  csv: [{
+    act: "",
+    bck: "",
+    bin: "33421405",
+    bout: "32806329",
+    check_code: "",
+    check_duration: "",
+    check_status: "",
+    chkdown: "",
+    chkfail: "",
+    cli_abrt: "",
+    comp_byp: "0",
+    comp_in: "0",
+    comp_out: "0",
+    comp_rsp: "0",
+    downtime: "",
+    dreq: "0",
+    dresp: "0",
+    econ: "",
+    ereq: "0",
+    eresp: "",
+    hanafail: "",
+    hrsp_1xx: "21967",
+    hrsp_2xx: "0",
+    hrsp_3xx: "0",
+    hrsp_4xx: "0",
+    hrsp_5xx: "0",
+    hrsp_other: "0",
+    iid: "2",
+    lastchg: "",
+    lbtot: "",
+    pid: "1",
+    pxname: "public",
+    qcur: "",
+    qlimit: "",
+    qmax: "",
+    rate: "195",
+    rate_lim: "0",
+    rate_max: "538",
+    req_rate: "194",
+    req_rate_max: "540",
+    req_tot: "21992",
+    scur: "27",
+    sid: "0",
+    slim: "2000",
+    smax: "81",
+    srv_abrt: "",
+    status: "OPEN",
+    stot: "21994",
+    svname: "FRONTEND",
+    throttle: "",
+    tracked: "",
+    type: "0",
+    weight: "",
+    wredis: "",
+    wretr: ""
+  }, {
+    act: "1",
+    bck: "0",
+    bin: "33421405",
+    bout: "32806329",
+    check_code: "",
+    check_duration: "",
+    check_status: "",
+    chkdown: "",
+    chkfail: "",
+    cli_abrt: "0",
+    comp_byp: "",
+    comp_in: "",
+    comp_out: "",
+    comp_rsp: "",
+    downtime: "",
+    dreq: "",
+    dresp: "0",
+    econ: "0",
+    ereq: "",
+    eresp: "0",
+    hanafail: "0",
+    hrsp_1xx: "21991",
+    hrsp_2xx: "0",
+    hrsp_3xx: "0",
+    hrsp_4xx: "0",
+    hrsp_5xx: "0",
+    hrsp_other: "0",
+    iid: "3",
+    lastchg: "",
+    lbtot: "21992",
+    pid: "1",
+    pxname: "realtime",
+    qcur: "0",
+    qlimit: "",
+    qmax: "0",
+    rate: "194",
+    rate_lim: "",
+    rate_max: "540",
+    req_rate: "",
+    req_rate_max: "",
+    req_tot: "",
+    scur: "25",
+    sid: "1",
+    slim: "32768",
+    smax: "77",
+    srv_abrt: "0",
+    status: "no check",
+    stot: "21992",
+    svname: "node1",
+    throttle: "",
+    tracked: "",
+    type: "2",
+    weight: "1",
+    wredis: "0",
+    wretr: "0"
+  }, {
+    act: "1",
+    bck: "0",
+    bin: "33421405",
+    bout: "32806329",
+    check_code: "",
+    check_duration: "",
+    check_status: "",
+    chkdown: "0",
+    chkfail: "",
+    cli_abrt: "0",
+    comp_byp: "0",
+    comp_in: "0",
+    comp_out: "0",
+    comp_rsp: "0",
+    downtime: "0",
+    dreq: "0",
+    dresp: "0",
+    econ: "0",
+    ereq: "",
+    eresp: "0",
+    hanafail: "",
+    hrsp_1xx: "21967",
+    hrsp_2xx: "0",
+    hrsp_3xx: "0",
+    hrsp_4xx: "0",
+    hrsp_5xx: "0",
+    hrsp_other: "0",
+    iid: "3",
+    lastchg: "648",
+    lbtot: "21992",
+    pid: "1",
+    pxname: "realtime",
+    qcur: "0",
+    qlimit: "",
+    qmax: "0",
+    rate: "194",
+    rate_lim: "",
+    rate_max: "540",
+    req_rate: "",
+    req_rate_max: "",
+    req_tot: "",
+    scur: "25",
+    sid: "0",
+    slim: "200",
+    smax: "77",
+    srv_abrt: "0",
+    status: "UP",
+    stot: "21992",
+    svname: "BACKEND",
+    throttle: "",
+    tracked: "",
+    type: "1",
+    weight: "1",
+    wredis: "0",
+    wretr: "0"
+  }, {
+    act: undefined,
+    bck: undefined,
+    bin: undefined,
+    bout: undefined,
+    check_code: undefined,
+    check_duration: undefined,
+    check_status: undefined,
+    chkdown: undefined,
+    chkfail: undefined,
+    cli_abrt: undefined,
+    comp_byp: undefined,
+    comp_in: undefined,
+    comp_out: undefined,
+    comp_rsp: undefined,
+    downtime: undefined,
+    dreq: undefined,
+    dresp: undefined,
+    econ: undefined,
+    ereq: undefined,
+    eresp: undefined,
+    hanafail: undefined,
+    hrsp_1xx: undefined,
+    hrsp_2xx: undefined,
+    hrsp_3xx: undefined,
+    hrsp_4xx: undefined,
+    hrsp_5xx: undefined,
+    hrsp_other: undefined,
+    iid: undefined,
+    lastchg: undefined,
+    lbtot: undefined,
+    pid: undefined,
+    pxname: "",
+    qcur: undefined,
+    qlimit: undefined,
+    qmax: undefined,
+    rate: undefined,
+    rate_lim: undefined,
+    rate_max: undefined,
+    req_rate: undefined,
+    req_rate_max: undefined,
+    req_tot: undefined,
+    scur: undefined,
+    sid: undefined,
+    slim: undefined,
+    smax: undefined,
+    srv_abrt: undefined,
+    status: undefined,
+    stot: undefined,
+    svname: undefined,
+    throttle: undefined,
+    tracked: undefined,
+    type: undefined,
+    weight: undefined,
+    wredis: undefined,
+    wretr: undefined
+  }]
+};