Version Notes
04.16.2013
+ Compatible with AITOC Magento Booster;
* Minor bug fixes are made.
Download this release
Release Info
| Developer | Aitoc |
| Extension | ServerLoadMonitorFree |
| Version | 1.0.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.0 to 1.0.1
- app/code/local/Aitoc/Aitloadmon/Model/Calculator/Abstract.php +1 -1
- app/code/local/Aitoc/Aitloadmon/Model/Calculator/Software.php +1 -1
- app/code/local/Aitoc/Aitloadmon/Model/Mysql4/Aitloadmon/Collection.php +1 -1
- app/code/local/Aitoc/Aitloadmon/Model/Process.php +16 -6
- app/code/local/Aitoc/Aitloadmon/Model/Router.php +1 -1
- app/code/local/Aitoc/Aitloadmon/etc/config.xml +1 -1
- app/etc/modules/Aitoc_Aitloadmon.xml +1 -1
- lib/Aitoc/Aitloadmon/Collect.php +32 -1
- package.xml +7 -5
app/code/local/Aitoc/Aitloadmon/Model/Calculator/Abstract.php
CHANGED
|
@@ -40,7 +40,7 @@ abstract class Aitoc_Aitloadmon_Model_Calculator_Abstract
|
|
| 40 |
{
|
| 41 |
return $data;
|
| 42 |
}
|
| 43 |
-
if($data = $this->_exec('cat '.$file))
|
| 44 |
{
|
| 45 |
return $data;
|
| 46 |
}
|
| 40 |
{
|
| 41 |
return $data;
|
| 42 |
}
|
| 43 |
+
if($data = $this->_exec('cat '.$file.' 2>/dev/null'))
|
| 44 |
{
|
| 45 |
return $data;
|
| 46 |
}
|
app/code/local/Aitoc/Aitloadmon/Model/Calculator/Software.php
CHANGED
|
@@ -39,7 +39,7 @@ class Aitoc_Aitloadmon_Model_Calculator_Software extends Aitoc_Aitloadmon_Model_
|
|
| 39 |
*/
|
| 40 |
protected function _getOsInfo()
|
| 41 |
{
|
| 42 |
-
if(!($os = $this->_exec('lsb_release -a')) && !($os = $this->_readOsInfoFromFiles()))
|
| 43 |
{
|
| 44 |
$os = php_uname();
|
| 45 |
}
|
| 39 |
*/
|
| 40 |
protected function _getOsInfo()
|
| 41 |
{
|
| 42 |
+
if(!($os = $this->_exec('lsb_release -a 2>/dev/null')) && !($os = $this->_readOsInfoFromFiles()))
|
| 43 |
{
|
| 44 |
$os = php_uname();
|
| 45 |
}
|
app/code/local/Aitoc/Aitloadmon/Model/Mysql4/Aitloadmon/Collection.php
CHANGED
|
@@ -40,7 +40,7 @@ class Aitoc_Aitloadmon_Model_Mysql4_Aitloadmon_Collection extends Mage_Core_Mode
|
|
| 40 |
break;
|
| 41 |
}
|
| 42 |
|
| 43 |
-
return 'DATE_FORMAT
|
| 44 |
}
|
| 45 |
|
| 46 |
/**
|
| 40 |
break;
|
| 41 |
}
|
| 42 |
|
| 43 |
+
return 'DATE_FORMAT(`measure_time`, "'.$format.'"), page_group_id';
|
| 44 |
}
|
| 45 |
|
| 46 |
/**
|
app/code/local/Aitoc/Aitloadmon/Model/Process.php
CHANGED
|
@@ -153,11 +153,7 @@ class Aitoc_Aitloadmon_Model_Process extends Mage_Core_Controller_Varien_Front
|
|
| 153 |
{
|
| 154 |
if(isset($dataItem['end']))
|
| 155 |
{
|
| 156 |
-
$minute = ceil($dataItem['end']/60);
|
| 157 |
-
if(!isset($dataItem['end']))
|
| 158 |
-
{
|
| 159 |
-
continue;
|
| 160 |
-
}
|
| 161 |
if(!isset($return[$minute]))
|
| 162 |
{
|
| 163 |
$return[$minute] = array();
|
|
@@ -305,5 +301,19 @@ class Aitoc_Aitloadmon_Model_Process extends Mage_Core_Controller_Varien_Front
|
|
| 305 |
}
|
| 306 |
|
| 307 |
}
|
| 308 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 309 |
}
|
| 153 |
{
|
| 154 |
if(isset($dataItem['end']))
|
| 155 |
{
|
| 156 |
+
$minute = ceil((int)$dataItem['end']/60);
|
|
|
|
|
|
|
|
|
|
|
|
|
| 157 |
if(!isset($return[$minute]))
|
| 158 |
{
|
| 159 |
$return[$minute] = array();
|
| 301 |
}
|
| 302 |
|
| 303 |
}
|
| 304 |
+
|
| 305 |
+
protected function _processRewriteUrl($url)
|
| 306 |
+
{
|
| 307 |
+
$startPos = strpos($url, '{');
|
| 308 |
+
if ($startPos!==false) {
|
| 309 |
+
$endPos = strpos($url, '}');
|
| 310 |
+
$routeName = substr($url, $startPos+1, $endPos-$startPos-1);
|
| 311 |
+
$router = Mage::getModel('aitloadmon/router');//$this->getRouterByRoute($routeName);
|
| 312 |
+
if ($router) {
|
| 313 |
+
$fronName = $router->getFrontNameByRoute($routeName);
|
| 314 |
+
$url = str_replace('{'.$routeName.'}', $fronName, $url);
|
| 315 |
+
}
|
| 316 |
+
}
|
| 317 |
+
return $url;
|
| 318 |
+
}
|
| 319 |
}
|
app/code/local/Aitoc/Aitloadmon/Model/Router.php
CHANGED
|
@@ -99,7 +99,7 @@ class Aitoc_Aitloadmon_Model_Router extends Mage_Core_Controller_Varien_Router_S
|
|
| 99 |
}
|
| 100 |
|
| 101 |
//checking if this place should be secure
|
| 102 |
-
|
| 103 |
|
| 104 |
$controllerClassName = $this->_validateControllerClassName($realModule, $controller);
|
| 105 |
if (!$controllerClassName) {
|
| 99 |
}
|
| 100 |
|
| 101 |
//checking if this place should be secure
|
| 102 |
+
//$this->_checkShouldBeSecure($request, '/'.$module.'/'.$controller.'/'.$action);
|
| 103 |
|
| 104 |
$controllerClassName = $this->_validateControllerClassName($realModule, $controller);
|
| 105 |
if (!$controllerClassName) {
|
app/code/local/Aitoc/Aitloadmon/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Aitoc_Aitloadmon>
|
| 5 |
-
<version>1.0.
|
| 6 |
</Aitoc_Aitloadmon>
|
| 7 |
</modules>
|
| 8 |
<admin>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Aitoc_Aitloadmon>
|
| 5 |
+
<version>1.0.1</version>
|
| 6 |
</Aitoc_Aitloadmon>
|
| 7 |
</modules>
|
| 8 |
<admin>
|
app/etc/modules/Aitoc_Aitloadmon.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Aitoc_Aitloadmon>
|
| 5 |
-
<active>
|
| 6 |
<codePool>local</codePool>
|
| 7 |
<self_name>Server Load Monitor Free</self_name>
|
| 8 |
</Aitoc_Aitloadmon>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Aitoc_Aitloadmon>
|
| 5 |
+
<active>false</active>
|
| 6 |
<codePool>local</codePool>
|
| 7 |
<self_name>Server Load Monitor Free</self_name>
|
| 8 |
</Aitoc_Aitloadmon>
|
lib/Aitoc/Aitloadmon/Collect.php
CHANGED
|
@@ -12,6 +12,7 @@ class Aitoc_Aitloadmon_Collect
|
|
| 12 |
private static $_enabled;
|
| 13 |
private static $_loadLevel;
|
| 14 |
private static $_pathAddon;
|
|
|
|
| 15 |
private $_uniqueId;
|
| 16 |
private $_startWritten;
|
| 17 |
|
|
@@ -109,9 +110,10 @@ class Aitoc_Aitloadmon_Collect
|
|
| 109 |
}
|
| 110 |
else
|
| 111 |
{
|
|
|
|
| 112 |
$saveData = array(
|
| 113 |
$this->_getUniqueId() => array(
|
| 114 |
-
'end' => microtime
|
| 115 |
)
|
| 116 |
);
|
| 117 |
}
|
|
@@ -263,4 +265,33 @@ class Aitoc_Aitloadmon_Collect
|
|
| 263 |
}
|
| 264 |
return self::$_loadLevel;
|
| 265 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 266 |
}
|
| 12 |
private static $_enabled;
|
| 13 |
private static $_loadLevel;
|
| 14 |
private static $_pathAddon;
|
| 15 |
+
private static $_timeOffset = 0;
|
| 16 |
private $_uniqueId;
|
| 17 |
private $_startWritten;
|
| 18 |
|
| 110 |
}
|
| 111 |
else
|
| 112 |
{
|
| 113 |
+
$microtime = microtime(true) + self::$_timeOffset;
|
| 114 |
$saveData = array(
|
| 115 |
$this->_getUniqueId() => array(
|
| 116 |
+
'end' => $microtime,
|
| 117 |
)
|
| 118 |
);
|
| 119 |
}
|
| 265 |
}
|
| 266 |
return self::$_loadLevel;
|
| 267 |
}
|
| 268 |
+
|
| 269 |
+
/**
|
| 270 |
+
* Gets time offset
|
| 271 |
+
*
|
| 272 |
+
* @return int
|
| 273 |
+
*/
|
| 274 |
+
public static function getTimeOffset()
|
| 275 |
+
{
|
| 276 |
+
return self::$_timeOffset;
|
| 277 |
+
}
|
| 278 |
+
|
| 279 |
+
/**
|
| 280 |
+
* Sets time offset
|
| 281 |
+
*
|
| 282 |
+
*/
|
| 283 |
+
public static function setTimeOffset($offset)
|
| 284 |
+
{
|
| 285 |
+
self::$_timeOffset = $offset;
|
| 286 |
+
}
|
| 287 |
+
|
| 288 |
+
/**
|
| 289 |
+
* Adds time offset
|
| 290 |
+
*
|
| 291 |
+
*/
|
| 292 |
+
public static function addTimeOffset($offset)
|
| 293 |
+
{
|
| 294 |
+
self::$_timeOffset += $offset;
|
| 295 |
+
}
|
| 296 |
+
|
| 297 |
}
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>ServerLoadMonitorFree</name>
|
| 4 |
-
<version>1.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.aitoc.com/en/aitdownloadablefiles/download/aitfile/aitfile_id/722/"> License - proprietary (can be found in module package) </license>
|
| 7 |
<channel>community</channel>
|
|
@@ -27,11 +27,13 @@ Server Load Monitor (free) features:
|
|
| 27 |
• The extension's functionality code is 100% Open Source.
|
| 28 |

|
| 29 |
* Please note that collected data will be sent to AITOC's Server Calculator in order to configure and recommend you better server settings. If you wish to disable sending data for Server Calculator stats, disable the ads, and get alerts about critical load peaks, please get the <a href=”http://aitoc.com/en/magentomods_ server_load_monitor_paid.htm”>paid version</a> of the extension. </description>
|
| 30 |
-
<notes>
|
|
|
|
|
|
|
| 31 |
<authors><author><name>AITOC</name><user>AITOC</user><email>aitoc-connect@aitoc.com</email></author></authors>
|
| 32 |
-
<date>2013-
|
| 33 |
-
<time>
|
| 34 |
-
<contents><target name="magelocal"><dir name="Aitoc"><dir name="Aitloadmon"><dir><dir name="Block"><dir name="Adminhtml"><file name="Aitlink.php" hash="4ea78c7a1d6f9e31aead66249a256a1d"/><dir name="Aitloadmon"><file name="BarGraph.php" hash="90e16b55a20987cdd214bc6da435ea6d"/><file name="Filter.php" hash="eade4a66c1a68f1a2334138fd4c33d3a"/><file name="LineGraph.php" hash="34eea0c6add4e36b0a37065cc9d87317"/></dir><file name="Aitloadmon.php" hash="5be3738e8cf84e5b85806701d6efbcd2"/><file name="Calculator.php" hash="4e08727116a1ac204bce97dab899b2e0"/><file name="CalculatorResult.php" hash="4524309b0433fd68ecc828b6a7fc8fc3"/><file name="Indicator.php" hash="9d1e87229cef34dafe0d2ec435f6bb9f"/><file name="Manage.php" hash="dbfdb4f6d788fba1469ab0a61fde9d9d"/></dir></dir><dir name="Helper"><file name="Data.php" hash="5249574ba1c636f4a2e5a59817011fb3"/></dir><dir name="Model"><file name="Aitloadmon.php" hash="8c7e29b4f586640975b8283688ab8bb7"/><file name="Analytics.php" hash="a223097ec56f7eea3329d43fe7e2956b"/><dir name="Calculator"><file name="Abstract.php" hash="
|
| 35 |
<compatible/>
|
| 36 |
<dependencies><required><php><min>5.2.0</min><max>5.4.13</max></php></required></dependencies>
|
| 37 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>ServerLoadMonitorFree</name>
|
| 4 |
+
<version>1.0.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.aitoc.com/en/aitdownloadablefiles/download/aitfile/aitfile_id/722/"> License - proprietary (can be found in module package) </license>
|
| 7 |
<channel>community</channel>
|
| 27 |
• The extension's functionality code is 100% Open Source.
|
| 28 |

|
| 29 |
* Please note that collected data will be sent to AITOC's Server Calculator in order to configure and recommend you better server settings. If you wish to disable sending data for Server Calculator stats, disable the ads, and get alerts about critical load peaks, please get the <a href=”http://aitoc.com/en/magentomods_ server_load_monitor_paid.htm”>paid version</a> of the extension. </description>
|
| 30 |
+
<notes>04.16.2013 
|
| 31 |
+
+ Compatible with AITOC Magento Booster; 
|
| 32 |
+
* Minor bug fixes are made. </notes>
|
| 33 |
<authors><author><name>AITOC</name><user>AITOC</user><email>aitoc-connect@aitoc.com</email></author></authors>
|
| 34 |
+
<date>2013-04-16</date>
|
| 35 |
+
<time>20:57:35</time>
|
| 36 |
+
<contents><target name="magelocal"><dir name="Aitoc"><dir name="Aitloadmon"><dir><dir name="Block"><dir name="Adminhtml"><file name="Aitlink.php" hash="4ea78c7a1d6f9e31aead66249a256a1d"/><dir name="Aitloadmon"><file name="BarGraph.php" hash="90e16b55a20987cdd214bc6da435ea6d"/><file name="Filter.php" hash="eade4a66c1a68f1a2334138fd4c33d3a"/><file name="LineGraph.php" hash="34eea0c6add4e36b0a37065cc9d87317"/></dir><file name="Aitloadmon.php" hash="5be3738e8cf84e5b85806701d6efbcd2"/><file name="Calculator.php" hash="4e08727116a1ac204bce97dab899b2e0"/><file name="CalculatorResult.php" hash="4524309b0433fd68ecc828b6a7fc8fc3"/><file name="Indicator.php" hash="9d1e87229cef34dafe0d2ec435f6bb9f"/><file name="Manage.php" hash="dbfdb4f6d788fba1469ab0a61fde9d9d"/></dir></dir><dir name="Helper"><file name="Data.php" hash="5249574ba1c636f4a2e5a59817011fb3"/></dir><dir name="Model"><file name="Aitloadmon.php" hash="8c7e29b4f586640975b8283688ab8bb7"/><file name="Analytics.php" hash="a223097ec56f7eea3329d43fe7e2956b"/><dir name="Calculator"><file name="Abstract.php" hash="f525c95d18986065984dcfd7b5211942"/><file name="Hardware.php" hash="1164c19b50d86b9a71da74f9629c2e1d"/><file name="Magento.php" hash="1ebcc5312a9e7991439e5ff05d1fb467"/><file name="Software.php" hash="523bb1256c28dfca3e6fb4b300d82f8e"/></dir><file name="Calculator.php" hash="726d6bc7cf5cd80b4d20cad5475b6da1"/><file name="CompressSource.php" hash="65b4aa585216893143d7ca28bfda6645"/><file name="Dblog.php" hash="4c134db8959a150f8031b71787ae2503"/><file name="LevelSource.php" hash="1937e32cc2b08ffbfc875d3a2f0d362b"/><file name="Manage.php" hash="6b06b0dbbb19d098b1414c6cd4a1bb8a"/><dir name="Mysql4"><dir name="Aitloadmon"><file name="Collection.php" hash="c644d5d7774e55f5c5d769cbded246dd"/></dir><file name="Aitloadmon.php" hash="1f4eddb6272e05d8463a82278cb2a854"/><dir name="Calculator"><file name="Collection.php" hash="15170dd43faeebdfc30e42ebd6270c28"/></dir><file name="Calculator.php" hash="7354931dd66342f5071f782b5de7401e"/><dir name="Dblog"><file name="Collection.php" hash="3dc0dcc5e9d3bb5951573d3d11a8e4dc"/></dir><file name="Dblog.php" hash="4f4e76036d37c170fdf4771f2669dce8"/><file name="UrlRewrite.php" hash="08aecaea96122e801cdb2f9793e22ddf"/></dir><file name="Observer.php" hash="a58aa407da9971ba9cc30afb5be41248"/><file name="Process.php" hash="61fea3ffbe9f29061e2f53f9c6e145de"/><file name="Router.php" hash="91ed3d96b51501d3852e8a2573c58674"/><file name="SysInfo.php" hash="a5c868f2ec1fa10cbbbca85c917a63f9"/><dir name="System"><file name="Abstract.php" hash="1cdc94c9f08d4507ef57fe766f30fe13"/></dir><file name="System.php" hash="6eeee453abc5efd3c35a24babe613609"/><file name="UrlRewrite.php" hash="ea3849ee4bedc6422b03bdb4be2535fd"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="AitloadmonController.php" hash="0c5f48b6086679ccdb1334d3d9e1e2a4"/><file name="CalculatorController.php" hash="b7f9d6de9974ccb27e37f17ad7cd7515"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a64ef461fcf678bc7bb28fe5b0e7cc3b"/><file name="config.xml" hash="b28d1cbce678b30764b90f5b7cc45b65"/><file name="system.xml" hash="4fc4ebb203b4a2943067696d7972c77b"/></dir><dir name="sql"><dir name="aitloadmon_setup"><file name="mysql4-install-1.0.0.php" hash="bb6d6c9aec69500be4a10d7944a82dfc"/><file name="mysql4-uninstall-1.0.0.php" hash="177151acef7c5d0c376f1d49bc5ce8c7"/></dir></dir></dir></dir><dir name="Aitsys"><dir><dir name="install"><file name="Aitoc_Aitloadmon.phtml" hash="9a81474e26aac8b23a5b2d2cdd6ab30d"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="aitloadmon.xml" hash="dde1da1952e5309e4125aaa6e328a8fa"/></dir><dir name="template"><dir name="aitloadmon"><file name="back.phtml" hash="ccc9f0ff80649046eddf0faa3b1b50c5"/><file name="bar.phtml" hash="2bd5dd221588543850d3f9a4f4a9e35e"/><file name="graph.phtml" hash="097408b5b89d48df6e80953d0c6a379a"/><file name="indicator.phtml" hash="f0dce9d5c49118b7f98573a91766c563"/><file name="line.phtml" hash="ea7b053633df4f7cdb23423225b8b34b"/><file name="quick.phtml" hash="b0eecb7f8296c293d7abff2cddc5aa5c"/><file name="sysInfo.phtml" hash="674767482f77361975c90c8bc412e4a5"/><file name="system.phtml" hash="b17117164a92d0fda7c99e9cf7027938"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Aitoc_Aitloadmon.xml" hash="f9495b99199f39960003b4e6270baacf"/></dir></target><target name="magelib"><dir name="Aitoc"><dir name="Aitloadmon"><dir><dir name="Adapter"><file name="Apc.php" hash="c67c74af65e094da996e39f0a8451d62"/><file name="File.php" hash="e440b9dc1c0792680043b8288d22f0a5"/><file name="Memcached.php" hash="b770d4016679b99e9dee9f82e28838a4"/></dir></dir><file name="Collect.php" hash="9178d6ff1c4a5b5873652810a5f1b3b2"/></dir></dir></target><target name="mageweb"><dir name="js"><dir name="aitoc"><dir name="aitloadmon"><file name="grafico.bar.custom.js" hash="e54db4c61047afb27a56968a8eec9fc4"/><file name="grafico.line.custom.js" hash="545ece867845d3e46d9091d021013be4"/><file name="grafico.min.js" hash="cde1bec6859b10e4a179aadec3c7e232"/><file name="raphael-min.js" hash="bcbc57198142f86c2e251525b214149d"/></dir></dir></dir></target><target name="mage"><dir name="."><file name="readme.txt" hash="33729d5788f0da4048501c989079b42e"/><file name="License agreement Server Load Monitor.pdf" hash="2c37f69a12f4508aa13181f6cefd264b"/><file name="Server Load Monitor Manual.pdf" hash="21465278b287e1a35d900a92233b796a"/></dir></target></contents>
|
| 37 |
<compatible/>
|
| 38 |
<dependencies><required><php><min>5.2.0</min><max>5.4.13</max></php></required></dependencies>
|
| 39 |
</package>
|
