From b9f76f18d74ee306ff1d079e4ba7f37775c94947 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 31 Jul 2013 10:32:45 +0200 Subject: [PATCH] adjusted dashboard for replication applier --- .../admin/js/templates/.dashboardView.ejs.swp | Bin 0 -> 24576 bytes html/admin/js/templates/dashboardView.ejs | 8 +++ html/admin/js/views/dashboardView.js | 48 +++++++----------- 3 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 html/admin/js/templates/.dashboardView.ejs.swp diff --git a/html/admin/js/templates/.dashboardView.ejs.swp b/html/admin/js/templates/.dashboardView.ejs.swp new file mode 100644 index 0000000000000000000000000000000000000000..d2f22a02715f25e2c61231cc3881ec7e01d5e0da GIT binary patch literal 24576 zcmeI4ON0>Z^j2#!^J2*f*MUcctbB9JP=Rf!Nh-6KXxAbU_e3)Unjrq>F%oP zum06v)qGVwTN{|#_Y`})f7rlwzhNBu>guzPK47dq`IuqEQV5?1fx5KZCL@1rpKj-O`FF~E##3s z<%+p}aWrl#j1EWvQsCMZNaS?+iS@?t(BOc|w5_z2ZQ6M7+VfLNQh*d71xNu>fD|AF zNC8rS6!_mOAe(*0Db(VQtR}T=zp7(@XLh_g+t)j;_hrXeE%*qW0ka?h z5*!92;QW1t@hR{D2UDO5M!|#N%6h{%3S3YDec;GC!}#o8Tn9624da`84C4Yg58eWA zg4e-W@Di8-o4{Xp8^+h*0(cSB!EUextOb9sF^o&#WAF|*3r>OwunlYiec-3N4C6!a zHh2Xb0{!4&umSvn35-v`d*C(j0yqN>gHf;%7~l#fJU#~>fH%NtFaw?ho531z6_Xwp z!Mos9a0-lrEnpq^2a_&efOFssh`>YOY{{F;bZIL)H05af4S^P?7Rhs)bD!DFfF=?Z(&tsm>j zB9)h^S|Kx&$bDm`><;W^=mxSk8^T5ddWbAhntu3p&Kg(o}c(M_{F+TtW$xpkJlyK=AV^GTSV`(sQ38$7`avQ^ajI!~pIF%|tRe--M;pm(^yvc#5| zT`%@9$%JW!HuAr>v(jZ|WeF=Qx6a7nE+dDRFmm|T896x8)!-vbwD-s@Ywp1=B?p&K zvNs!Z*9`byj@E~`#g*+SY}(;mQ1(TTFnl%CepJp+EB{U(e5;nA zX9yVFjh7|*O4Vr;$@1I7JQC<_GRL&c z^sbBadqvmMOgyiwzoO_a5FJTJ-;;I`3w1+Rr0dj~ZpA)oN!f}ndqFqd5h+dgs{T*+ zlQ&7nJ+6mFyXh(_bu!)B2d?dT(-kU=Z!cBH@^|1dY-Qgl^)Q(QUAocKfU4VUVF1l@ z6=Pb9<_n|F5OS&b|7pbK7lDfZ^Y!`f5#PTL&Vkb)1`ap^o&)3H5%3V$0{%d}{{wg# z>;x6i2QH)BpTT$F5>WT~63|8pkOHItDL@L40;B*bKnjooqyQ;!Jqo0AhX}_PrYG9x zMdR5<9$(_)n4VzWr4|rNX3M02TKh}qJoiSt>7>)FMZRSxUb6|)+PG_r19PsdJH=e7 zi|NBMe%+nKOn;nnTq&4cQ|DaYJ%N=J%PeLF)f8@r9a$8c8?q1}V`leYjG$eu0Q5eu ztLs=;spgg2W_0!RMvI4ublN7ZvlUf0;M2i}VP(mw1g*$MnxcVIvZ8 zZ?9YDnHG72b7j+1{J$6ReF#+ikJr-mrr!HMm7Nc;_tkaUNC8rS6d(mi0aAbzAO%PP zQh*d71xNu>;93+YCIZxg|8g?{`Zv^j@Y^t9_q4v>`P=JhT?E4`7=fs(->xz))xX%6 K>Ia|r_3Xbj$+G+a literal 0 HcmV?d00001 diff --git a/html/admin/js/templates/dashboardView.ejs b/html/admin/js/templates/dashboardView.ejs index 0234e7ab9a..26ae8dc07f 100644 --- a/html/admin/js/templates/dashboardView.ejs +++ b/html/admin/js/templates/dashboardView.ejs @@ -91,6 +91,14 @@ Last applied tick + + Total number of requests + + + + Total number of failed connection attempts + + Progress diff --git a/html/admin/js/views/dashboardView.js b/html/admin/js/views/dashboardView.js index 502dad6dcd..15c26ebefc 100644 --- a/html/admin/js/views/dashboardView.js +++ b/html/admin/js/views/dashboardView.js @@ -98,10 +98,10 @@ var dashboardView = Backbone.View.extend({ }, putReplicationStatus: function () { - var time; - var clientString = '-'; + var loggerRunning = this.replLogState.state.running; + var applierRunning = this.replApplyState.state.running; - if (this.replApplyState.state.running === true) { + if (applierRunning || this.replApplyState.state.lastError != '') { $('#detailReplication').height(290); $('.checkApplyRunningStatus').show(); } @@ -109,19 +109,15 @@ var dashboardView = Backbone.View.extend({ $('.checkApplyRunningStatus').hide(); } - time = this.replLogState.state.time; + var time = this.replLogState.state.time; - var runningLog; - if (this.replLogState.state.running === true) { - runningLog = '
true
'; - } - else { - runningLog = '
false
'; - } + var cls = loggerRunning ? 'true' : 'false'; + var runningLog = '
' + cls + '
'; + var clientString = '-'; if (this.replLogState.state.clients) { $.each(this.replLogState.state.clients, function(k,v) { - clientString = clientString + "Server: "+v.serverId+" | Time: "+v.time+"\n"; + clientString = clientString + "Server: " + v.serverId + " | Time: " + v.time + "\n"; }); } @@ -138,22 +134,17 @@ var dashboardView = Backbone.View.extend({ //apply table - var lastAppliedTick; + var lastAppliedTick = "-"; var progress = "-"; var lastError = "-"; var endpoint = "-"; + var numRequests = "-"; + var numFailed = "-"; - if (this.replApplyState.state.lastAppliedContinuousTick === null) { - lastAppliedTick = this.replApplyState.state.lastAppliedInitialTick; - } - else { + if (this.replApplyState.state.lastAppliedContinuousTick !== null) { lastAppliedTick = this.replApplyState.state.lastAppliedContinuousTick; } - if (lastAppliedTick === null) { - lastAppliedTick = "-"; - } - if (this.replApplyState.state.endpoint !== undefined) { endpoint = this.replApplyState.state.endpoint; } @@ -167,22 +158,21 @@ var dashboardView = Backbone.View.extend({ if (this.replApplyState.state.lastError) { lastError = this.replApplyState.state.lastError.errorMessage; } - var runningApply; - if (this.replApplyState.state.running === true) { - runningApply = '
true
'; - } - else { - runningApply = '
false
'; - } + cls = applierRunning ? 'true' : 'false'; + var runningApply = '
' + cls + '
'; + + numRequests = this.replApplyState.state.totalRequests || 0; + numFailed = this.replApplyState.state.totalFailedConnects || 0; $('#applyRunningVal').html(runningApply); $('#applyEndpointVal').text(endpoint); $('#applyLastAppliedTickVal').text(lastAppliedTick); $('#applyTimeVal').text(time); $('#applyProgressVal').text(progress); + $('#applyTotalRequestsVal').text(numRequests); + $('#applyTotalFailedVal').text(numFailed); $('#applyLastErrorVal').text(lastError); - }, render: function() {