Skip to content

Commit 84377f0

Browse files
elijaaelijaa
committed
Fix # 21 and removing Graphics Part
1 parent 34846d7 commit 84377f0

File tree

5 files changed

+82
-127
lines changed

5 files changed

+82
-127
lines changed

‎View/LiveStats/Frame.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
<div class="full-size padding">
2121
<br/>
2222
<span class="live">Actually looking at <?php echo Library_HTML_Components::clusterSelect('cluster_select', (isset($_GET['cluster'])) ? $_GET['cluster'] : '', 'live', 'onchange="changeCluster(this);"'); ?> stats</span>
23+
<!-- In Progress
2324
<select class="right live" id="cluster_select" class="live" style="width:120px;">
2425
<option value="console" selected="selected">Console Mode</option>
2526
<option value="graphic">Graphic Mode</option>
2627
</select>
27-
28+
-->
2829
<pre id="stats" class="live">
2930

3031
Loading live stats, please wait ~<?php echo sprintf('%.0f', 5 + $refresh_rate - $_ini->get('refresh_rate')); ?> seconds ...

‎View/LiveStats/Stats.phtml

Lines changed: 62 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,87 @@
11
<?php
2-
# Console Mode
3-
if($mode == 'console')
4-
{
5-
# CRLF/EOL
6-
define('EOL', "\r\n");
2+
# CRLF/EOL
3+
define('EOL', "\r\n");
4+
5+
# Header
6+
echo 'Last update : ' . date('r', time()) . ' (refresh rate : ' . $_ini->get('refresh_rate') . ' sec)' . EOL . EOL;
77

8-
# Header
9-
echo 'Last update : ' . date('r', time()) . ' (refresh rate : ' . $_ini->get('refresh_rate') . ' sec)' . EOL . EOL;
8+
# Table header
9+
echo '<strong>' . sprintf('%-36s', 'NAME') . sprintf('%10s', 'SIZE') . sprintf('%7s', '%MEM') . sprintf('%8s', 'TIME') .
10+
sprintf('%6s', 'CONN') . sprintf('%7s', '%HIT') . sprintf('%8s', 'REQ/s') . sprintf('%8s', 'GET/s') . sprintf('%8s', 'SET/s') .
11+
sprintf('%8s', 'DEL/s') . sprintf('%8s', 'EVI/s') . sprintf('%11s', 'READ/s') . sprintf('%10s', 'WRITE/s') . '</strong>' . EOL . '<hr>';
1012

11-
# Table header
12-
echo '<strong>' . sprintf('%-36s', 'NAME') . sprintf('%10s', 'SIZE') . sprintf('%7s', '%MEM') . sprintf('%8s', 'TIME') .
13-
sprintf('%6s', 'CONN') . sprintf('%7s', '%HIT') . sprintf('%8s', 'REQ/s') . sprintf('%8s', 'GET/s') . sprintf('%8s', 'SET/s') .
14-
sprintf('%8s', 'DEL/s') . sprintf('%8s', 'EVI/s') . sprintf('%11s', 'READ/s') . sprintf('%10s', 'WRITE/s') . '</strong>' . EOL . '<hr>';
13+
# Showing stats for every server
14+
foreach($stats as $server => $data)
15+
{
16+
# Server name
17+
echo sprintf('%-36.36s', $server);
1518

16-
# Showing stats for every server
17-
foreach($stats as $server => $data)
19+
# Checking for stats validity
20+
if((isset($data['time'], $data['bytes_percent'], $data['get_hits_percent'], $data['query_time'], $data['request_rate'], $data['curr_connections'],
21+
$data['get_rate'], $data['set_rate'], $data['delete_rate'], $data['eviction_rate'], $data['bytes_read'], $data['bytes_written'])) && ($data['time'] > 0))
1822
{
19-
# Server name
20-
echo sprintf('%-36.36s', $server);
23+
# Total Memory
24+
echo sprintf('%10s', Library_Data_Analysis::byteResize($data['limit_maxbytes']) . 'b');
2125

22-
# Checking for stats validity
23-
if((isset($data['time'], $data['bytes_percent'], $data['get_hits_percent'], $data['query_time'], $data['request_rate'], $data['curr_connections'],
24-
$data['get_rate'], $data['set_rate'], $data['delete_rate'], $data['eviction_rate'], $data['bytes_read'], $data['bytes_written'])) && ($data['time'] > 0))
26+
# Memory Occupation / Alert State
27+
if($data['bytes_percent'] > $_ini->get('memory_alert'))
2528
{
26-
# Total Memory
27-
echo sprintf('%10s', Library_Data_Analysis::byteResize($data['limit_maxbytes']) . 'b');
28-
29-
# Memory Occupation / Alert State
30-
if($data['bytes_percent'] > $_ini->get('memory_alert'))
31-
{
32-
echo str_pad('', 7 - strlen($data['bytes_percent']), ' ') . '<span class="red">' . sprintf('%.1f', $data['bytes_percent']) . '</span>';
33-
}
34-
else
35-
{
36-
echo sprintf('%7.1f', $data['bytes_percent']);
37-
}
38-
39-
# Query Time
40-
echo sprintf('%5.0f', Library_Data_Analysis::valueResize($data['query_time'])) . ' ms';
41-
42-
# Current connection
43-
echo sprintf('%6s', $data['curr_connections']);
44-
45-
# Hit percent (get)
46-
if($data['get_hits_percent'] < $_ini->get('hit_rate_alert'))
47-
{
48-
echo str_pad('', 7 - strlen($data['get_hits_percent']), ' ') . '<span class="red">' . sprintf('%.1f', $data['get_hits_percent']) . '</span>';
49-
}
50-
else
51-
{
52-
echo sprintf('%7.1f', $data['get_hits_percent']);
53-
}
54-
55-
# Request rate
56-
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['request_rate']));
57-
58-
# Get rate
59-
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['get_rate']));
60-
61-
# Set rate
62-
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['set_rate']));
63-
64-
# Delete rate
65-
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['delete_rate']));
66-
67-
# Eviction rate
68-
if($data['eviction_rate'] > $_ini->get('eviction_alert'))
69-
{
70-
echo str_pad('', 8 - strlen(Library_Data_Analysis::valueResize($data['eviction_rate'])), ' ') . '<span class="red">' . Library_Data_Analysis::valueResize($data['eviction_rate']) . '</span>';
71-
}
72-
else
73-
{
74-
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['eviction_rate']));
75-
}
76-
77-
# Bytes read
78-
echo sprintf('%11s', Library_Data_Analysis::byteResize($data['bytes_read'] / $data['time']) . 'b');
79-
80-
# Bytes written
81-
echo sprintf('%10s', Library_Data_Analysis::byteResize($data['bytes_written'] / $data['time']) . 'b');
29+
echo str_pad('', 7 - strlen($data['bytes_percent']), ' ') . '<span class="red">' . sprintf('%.1f', $data['bytes_percent']) . '</span>';
8230
}
8331
else
8432
{
85-
echo str_pad('', 20, ' ') . '<span class="alert">An error has occured when retreiving or calculating stats</span>';
33+
echo sprintf('%7.1f', $data['bytes_percent']);
8634
}
8735

88-
# End of Line
89-
echo EOL . '<hr>';
90-
}
91-
}
92-
else
93-
{
94-
# Graphic mode
95-
$array = array();
36+
# Query Time
37+
echo sprintf('%5.0f', Library_Data_Analysis::valueResize($data['query_time'])) . ' ms';
9638

97-
# Showing stats for every server
98-
foreach($stats as $server => $data)
99-
{
100-
$array['time'] = time() * 1000;
39+
# Current connection
40+
echo sprintf('%6s', $data['curr_connections']);
10141

102-
# Checking for stats validity
103-
if((isset($data['time'], $data['bytes_percent'], $data['get_hits_percent'], $data['query_time'], $data['request_rate'], $data['curr_connections'],
104-
$data['get_rate'], $data['set_rate'], $data['delete_rate'], $data['eviction_rate'], $data['bytes_read'], $data['bytes_written'])) && ($data['time'] > 0))
42+
# Hit percent (get)
43+
if($data['get_hits_percent'] < $_ini->get('hit_rate_alert'))
44+
{
45+
echo str_pad('', 7 - strlen($data['get_hits_percent']), ' ') . '<span class="red">' . sprintf('%.1f', $data['get_hits_percent']) . '</span>';
46+
}
47+
else
10548
{
106-
# Hit rate
107-
$array['%HIT'][$server] = $data['get_hits_percent'];
49+
echo sprintf('%7.1f', $data['get_hits_percent']);
50+
}
10851

109-
# Request rate
110-
$array['REQ/s'][$server] = $data['request_rate'];
52+
# Request rate
53+
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['request_rate']));
11154

112-
# Eviction rate
113-
$array['EVI/s'][$server] = $data['eviction_rate'];
55+
# Get rate
56+
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['get_rate']));
11457

115-
# Memory Occupation / Alert State
116-
$array['%MEM'][$server] = $data['bytes_percent'];
58+
# Set rate
59+
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['set_rate']));
11760

118-
# Query Time
119-
$array['TIME'][$server] = sprintf('%0.1f', $data['query_time']);
61+
# Delete rate
62+
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['delete_rate']));
12063

121-
# Current connection
122-
$array['CONN'][$server] = $data['curr_connections'];
64+
# Eviction rate
65+
if($data['eviction_rate'] > $_ini->get('eviction_alert'))
66+
{
67+
echo str_pad('', 8 - strlen(Library_Data_Analysis::valueResize($data['eviction_rate'])), ' ') . '<span class="red">' . Library_Data_Analysis::valueResize($data['eviction_rate']) . '</span>';
68+
}
69+
else
70+
{
71+
echo sprintf('%8s', Library_Data_Analysis::valueResize($data['eviction_rate']));
72+
}
12373

124-
# Bytes read
125-
$array['READ/s'][$server] = sprintf('%0.2f', $data['bytes_read'] / $data['time'] / 1024);
74+
# Bytes read
75+
echo sprintf('%11s', Library_Data_Analysis::byteResize($data['bytes_read'] / $data['time']) . 'b');
12676

127-
# Bytes written
128-
$array['WRITE/s'][$server] = sprintf('%0.2f', $data['bytes_written'] / $data['time'] / 1024);
129-
}
77+
# Bytes written
78+
echo sprintf('%10s', Library_Data_Analysis::byteResize($data['bytes_written'] / $data['time']) . 'b');
79+
}
80+
else
81+
{
82+
echo str_pad('', 20, ' ') . '<span class="alert">An error has occured when retreiving or calculating stats</span>';
13083
}
13184

132-
echo json_encode($array, JSON_NUMERIC_CHECK);
85+
# End of Line
86+
echo EOL . '<hr>';
13387
}

‎View/Stats/Items.phtml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="sub-header corner full-size padding">Console</div>
22
<div class="container corner full-size padding" id="console" style="visibility:visible;display:block;">
33
<pre id="container" style="font-size:11px;overflow:auto;min-height:80px;max-height:196px;" class="full-size">
4-
5-
4+
5+
66
Click on an item's key below to see it's content here
77

88
</pre>
@@ -14,7 +14,7 @@
1414
<input class="header" type="submit" onclick="javascript:executeClear('container')" value="Clear Console"/>
1515
<input class="header" id="hide" type="submit" onclick="javascript:executeHideShow('console', 'hide');javascript:this.blur();" value="Hide Console"/>
1616
</div>
17-
17+
1818
<div class="sub-header corner full-size padding">
1919
Items in Slab <?php echo $_GET['slab']; ?>, only showing first <?php echo $_ini->get('max_item_dump'); ?> items
2020
<span style="float:right;">
@@ -30,9 +30,9 @@ foreach($items as $key => $data)
3030
{
3131
# Checking if first item
3232
if($notFirst) { echo '<hr/>'; }
33-
?>
34-
<a class="green item" style=""
35-
onclick="javascript:executeHideShow('console', 'hide', true);javascript:executeCommand('container', 'request_key=<?php echo $key; ?>&amp;request_api=<?php echo $_ini->get('get_api'); ?>&amp;request_command=get&amp;request_server=<?php echo $_GET['server']; ?>');"><?php echo ((strlen($key) > 70) ? substr($key, 0, 70) . '[..]' : $key); ?></a>
33+
?>
34+
<a class="green item" style=""
35+
onclick="javascript:executeHideShow('console', 'hide', true);javascript:executeCommand('container', 'request_key=<?php echo urlencode($key); ?>&amp;request_api=<?php echo $_ini->get('get_api'); ?>&amp;request_command=get&amp;request_server=<?php echo $_GET['server']; ?>');"><?php echo ((strlen($key) > 70) ? substr($key, 0, 70) . '[..]' : $key); ?></a>
3636

3737
<span class="right" style="clear:right;">
3838
<strong>Size</strong> : <?php echo Library_Data_Analysis::byteResize($data[0]); ?>Bytes,

‎View/Stats/Stats.phtml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,9 @@ elseif((isset($_GET['server'])) && ($cluster = $_ini->cluster($_GET['server'])))
377377

378378
<div class="sub-header corner padding">Cache Size <span class="green">Graphic</span></div>
379379
<div class="container corner padding">
380+
<div id="cacheUsageContainer"></div>
380381
<script>
381-
$(function () {
382-
$('#cacheUsageContainer').highcharts({
382+
new Highcharts.Chart({
383383
chart: {
384384
backgroundColor: '#EBEBEB',
385385
plotBorderWidth: null,
@@ -389,7 +389,8 @@ elseif((isset($_GET['server'])) && ($cluster = $_ini->cluster($_GET['server'])))
389389
marginLeft: 0,
390390
marginRight: 0,
391391
marginTop: 0,
392-
marginBottom: 0
392+
marginBottom: 0,
393+
renderTo: 'cacheUsageContainer'
393394
},
394395
title: {
395396
text: '<b><?php echo Library_Data_Analysis::byteResize($stats['limit_maxbytes']); ?>Bytes</b>',
@@ -434,9 +435,7 @@ elseif((isset($_GET['server'])) && ($cluster = $_ini->cluster($_GET['server'])))
434435
color: '#FFFFFF'}]
435436
}]
436437
});
437-
});
438438
</script>
439-
<div id="cacheUsageContainer"></div>
440439
</div>
441440
<?php
442441
# Viewing a single server
@@ -485,17 +484,18 @@ elseif((isset($_GET['server'])) && ($cluster = $_ini->cluster($_GET['server'])))
485484

486485
<div class="sub-header corner padding">Hit &amp; Miss Rate <span class="green">Graphic</span></div>
487486
<div class="container corner padding">
487+
<div id="hitsContainer"></div>
488488
<script>
489-
$(function () {
490-
$('#hitsContainer').highcharts({
489+
new Highcharts.Chart({
491490
chart: {
492491
backgroundColor: '#EBEBEB',
493492
width: 274,
494493
height: 147,
495494
marginLeft: 0,
496495
marginRight: 0,
497496
marginTop: 0,
498-
marginBottom: 20
497+
marginBottom: 20,
498+
renderTo: 'hitsContainer'
499499
},
500500
title: {
501501
text: null
@@ -534,9 +534,7 @@ elseif((isset($_GET['server'])) && ($cluster = $_ini->cluster($_GET['server'])))
534534
color: '#B5463F'}]
535535
}]
536536
});
537-
});
538537
</script>
539-
<div id="hitsContainer"></div>
540538
</div>
541539

542540
<div class="sub-header corner padding">Network <span class="green">Stats</span></div>

‎stats.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
$_GET['cluster'] = $cluster;
4747
}
4848

49+
/** In Progress
4950
# Getting view mode
5051
if(isset($_GET['mode']) && (($_GET['mode'] == 'console') || ($_GET['mode'] == 'graphic')))
5152
{
@@ -55,6 +56,7 @@
5556
{
5657
$mode = 'graphic';
5758
}
59+
*/
5860

5961
# Hashing cluster
6062
$hash = md5($_GET['cluster']);
@@ -171,8 +173,8 @@
171173
include 'View/Header.phtml';
172174

173175
# Showing live stats frame
174-
#include 'View/LiveStats/Frame.phtml';
175-
include 'View/LiveStats/Graphic.phtml';
176+
include 'View/LiveStats/Frame.phtml';
177+
# include 'View/LiveStats/Graphic.phtml';
176178

177179
# Showing footer
178180
include 'View/Footer.phtml';

0 commit comments

Comments
 (0)