+
@@ -265,7 +265,7 @@
1
1
1
- How to find your graph urls]]>
+ How to find your graph urls]]>
diff --git a/app/code/community/ProxiBlue/NewRelic/sql/proxiblue_newrelic_setup/mysql4-install-0.0.1.php b/app/code/community/ProxiBlue/NewRelic/sql/proxiblue_newrelic_setup/mysql4-install-0.0.1.php
index 557ce16..e658bce 100755
--- a/app/code/community/ProxiBlue/NewRelic/sql/proxiblue_newrelic_setup/mysql4-install-0.0.1.php
+++ b/app/code/community/ProxiBlue/NewRelic/sql/proxiblue_newrelic_setup/mysql4-install-0.0.1.php
@@ -1,21 +1,21 @@
.
- **/
+/**
+ * This file is part of ProxiBlue NewRelic Module available via GitHub https://github.com/ProxiBlue/NewRelic
+ *
+ * ProxiBlue NewRelic Module is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ProxiBlue NewRelic Module is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ProxiBlue NewRelic Module.
+ * If not, see .
+ **/
?>
.
* */
@@ -26,12 +26,14 @@
* @category Mage
* @package Mage_Core
*/
-class Mage_Core_Exception extends Exception {
+class Mage_Core_Exception extends Exception
+{
protected $_messages = array();
protected $_lastException = null;
- public function addMessage(Mage_Core_Model_Message_Abstract $message) {
+ public function addMessage(Mage_Core_Model_Message_Abstract $message)
+ {
if (!isset($this->_messages[$message->getType()])) {
$this->_messages[$message->getType()] = array();
}
@@ -39,7 +41,8 @@ public function addMessage(Mage_Core_Model_Message_Abstract $message) {
return $this;
}
- public function getMessages($type = '') {
+ public function getMessages($type = '')
+ {
if ('' == $type) {
$arrRes = array();
foreach ($this->_messages as $messageType => $messages) {
@@ -57,7 +60,8 @@ public function getMessages($type = '') {
* @param bool $append
* @return Mage_Core_Exception
*/
- public function setMessage($message, $append = false) {
+ public function setMessage($message, $append = false)
+ {
if ($append) {
$this->message .= $message;
} else {
@@ -68,9 +72,10 @@ public function setMessage($message, $append = false) {
/**
* Additions by ProxiBlue to log exceptions with new relic.
- *
+ *
*/
- public function __construct($message = '', $code = 0, $previous = null) {
+ public function __construct($message = '', $code = 0, $previous = null)
+ {
parent::__construct($message, $code, $previous);
if ($this instanceof Mage_Core_Model_Store_Exception || $this instanceof ProxiBlue_NewRelic_Exception) {
// this is a store or newrelic module exception
@@ -83,10 +88,12 @@ public function __construct($message = '', $code = 0, $previous = null) {
$maxTraceItterations = 100;
// 100 seems like a safe test. If this test works, a config option would be created to allow users to set this.
foreach ($stackTrace as $_trace) {
- if($maxTraceItterations == 0) {
+ if ($maxTraceItterations == 0) {
break;
}
- if (is_array($_trace) && array_key_exists('class', $_trace) && $_trace['class'] == 'Mage_Core_Model_Config') {
+ if (is_array($_trace) && array_key_exists('class', $_trace)
+ && $_trace['class'] == 'Mage_Core_Model_Config'
+ ) {
// some config issue, log it direct
ProxiBlue_NewRelic_Model_Log_Exception::pushEvent($this, false);
return $this;
@@ -96,7 +103,9 @@ public function __construct($message = '', $code = 0, $previous = null) {
}
$newRelic = Mage::getModel('proxiblue_newrelic/log_Exception');
// make sure we have an object here!
- if (is_object($newRelic) && $newRelic instanceof ProxiBlue_NewRelic_Model_Log_Exception && $newRelic->getEnabled()) {
+ if (is_object($newRelic) && $newRelic instanceof ProxiBlue_NewRelic_Model_Log_Exception
+ && $newRelic->getEnabled()
+ ) {
$newRelic->recordEvent($this);
}
}
diff --git a/app/design/adminhtml/default/default/template/dashboard/proxiblue_newrelic.phtml b/app/design/adminhtml/default/default/template/dashboard/proxiblue_newrelic.phtml
index 55412e4..fc9c4bf 100755
--- a/app/design/adminhtml/default/default/template/dashboard/proxiblue_newrelic.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/proxiblue_newrelic.phtml
@@ -1,7 +1,7 @@
getEmbededGraphs() as $graphUrl): ?>