diff --git a/SendSupportNotification.php b/SendSupportNotification.php
index 8a63053e959f25856a64c552b274ea5630768e2b..17c81cd4bbf08baef819ba9c2928e11a6cf04ca0 100755
--- a/SendSupportNotification.php
+++ b/SendSupportNotification.php
@@ -28,7 +28,7 @@ require("config.php");
global $adb;
global $log;
global $HELPDESK_SUPPORT_EMAIL_ID,$HELPDESK_SUPPORT_NAME;
-$log = VtigerLogger::getLogger('SendSupportNotification');
+$log = Logger::getLogger('SendSupportNotification');
$log->debug(" invoked SendSupportNotification ");
// retrieve the translated strings.
diff --git a/config.performance.php b/config.performance.php
index 66fd8a69591eee7a89b83a8ae6ed8373588d0a62..db6125cdc0ff2af6a0bc7943f02cdda4fcfa92ab 100644
--- a/config.performance.php
+++ b/config.performance.php
@@ -10,7 +10,7 @@
/* Performance paramters can be configured to fine tune vtiger CRM runtime */
$PERFORMANCE_CONFIG = Array(
// Enable Vtiger Log Level for debugging only if requried
- 'LOGLEVEl_DEBUG' => true,
+ 'LOGLEVEl_DEBUG' => false,
// Should the caller information be captured in SQL Logging?
// It adds little overhead for performance but will be useful to debug
diff --git a/cron/SendReminder.service b/cron/SendReminder.service
index 48263e29ac3731491eb41a1e84ff40f04362e234..70d5e538b66a75c335e06494dbc2e6fed3fde8c3 100644
--- a/cron/SendReminder.service
+++ b/cron/SendReminder.service
@@ -42,7 +42,7 @@ if(empty($from)) {
global $adb;
global $log;
global $site_URL;
-$log =VtigerLogger::getLogger('SendReminder');
+$log =Logger::getLogger('SendReminder');
$log->debug(" invoked SendReminder ");
// retrieve the translated strings.
diff --git a/cron/modules/SalesOrder/RecurringInvoice.service b/cron/modules/SalesOrder/RecurringInvoice.service
index 17a824a29509fafb33c79446551d7784b09edfda..c36a7057482614753779d21b913c1e25cfbcfd47 100644
--- a/cron/modules/SalesOrder/RecurringInvoice.service
+++ b/cron/modules/SalesOrder/RecurringInvoice.service
@@ -12,7 +12,7 @@ require_once('include/utils/utils.php');
require_once('include/logging.php');
global $adb, $log;
-$log = VtigerLogger::getLogger('RecurringInvoice');
+$log = Logger::getLogger('RecurringInvoice');
$log->debug("invoked RecurringInvoice");
$currentDate = date('Y-m-d');
diff --git a/data/Tracker.php b/data/Tracker.php
index fd52d9d4daa599d736535fa69110a7344a91d201..7c59b6e75bbf00a811f43b3add6c262285e2b56a 100755
--- a/data/Tracker.php
+++ b/data/Tracker.php
@@ -46,7 +46,7 @@ class Tracker {
);
function __construct()
{
- $this->log = VtigerLogger::getLogger('Tracker');
+ $this->log = Logger::getLogger('Tracker');
// $this->db = PearDatabase::getInstance();
global $adb;
$this->db = $adb;
diff --git a/include/database/PearDatabase.php b/include/database/PearDatabase.php
index 1f82753330e95eae4a0ed3a4a07bdc8fcf2bfc76..9a6cd7377f70439dfdaf36d63a497c6de45b9614 100644
--- a/include/database/PearDatabase.php
+++ b/include/database/PearDatabase.php
@@ -16,8 +16,8 @@
require_once 'include/logging.php';
require_once 'libraries/adodb_vtigerfix/adodb.inc.php';
-$log = VtigerLogger::getLogger('VT');
-$logsqltm = VtigerLogger::getLogger('SQLTIME');
+$log = Logger::getLogger('VT');
+$logsqltm = Logger::getLogger('SQLTIME');
// Callback class useful to convert PreparedStatement Question Marks to SQL value
// See function convertPS2Sql in PearDatabase below
@@ -113,7 +113,7 @@ class PearDatabase{
function println($msg)
{
- $log1 = VtigerLogger::getLogger('VT');
+ $log1 = Logger::getLogger('VT');
if(is_array($msg)) {
$log1->info("PearDatabse ->".print_r($msg,true));
} else {
@@ -857,7 +857,7 @@ class PearDatabase{
*/
function __construct($dbtype='',$host='',$dbname='',$username='',$passwd='') {
global $currentModule;
- $this->log = VtigerLogger::getLogger('PearDatabase_'. $currentModule);
+ $this->log = Logger::getLogger('PearDatabase_'. $currentModule);
$this->resetSettings($dbtype,$host,$dbname,$username,$passwd);
// Initialize performance parameters
diff --git a/include/logging.php b/include/logging.php
index 1e3e3e9d087ddf2732b1223d40ac02de2e38d7c3..d86b285b5b29a0c15c87ab6629510b3697a7193f 100644
--- a/include/logging.php
+++ b/include/logging.php
@@ -21,15 +21,5 @@ require_once('config.php');
// Performance Optimization: Configure the log folder
@include_once('config.performance.php');
-require_once 'modules/Vtiger/helpers/VtigerLogger.php';
-
-global $PERFORMANCE_CONFIG;
-if(isset($PERFORMANCE_CONFIG) && isset($PERFORMANCE_CONFIG['LOGLEVEl_DEBUG']) && $PERFORMANCE_CONFIG['LOGLEVEl_DEBUG']) {
- VtigerLogger::$filePath = "logs/vtigercrm.log"; // Default log file path.
- VtigerLogger::$logLevel = 100; // Default debug level defined in Monolog.
-} else {
- VtigerLogger::$logLevel = 0;
-}
-// END
-
+require_once 'modules/Vtiger/helpers/Logger.php';
?>
diff --git a/include/utils/export.php b/include/utils/export.php
index 66bc892af08516cca29c88da8f7d42c3f0405dcd..d4c6b74562d419b017858ca37cbcbfb16cf3a509 100755
--- a/include/utils/export.php
+++ b/include/utils/export.php
@@ -107,7 +107,7 @@ function export($type){
// Refer to the logic in setting $currentModule in index.php
$focus = CRMEntity::getInstance($type);
}
- $log = VtigerLogger::getLogger('export_'.$type);
+ $log = Logger::getLogger('export_'.$type);
$db = PearDatabase::getInstance();
$oCustomView = new CustomView("$type");
diff --git a/modules/Accounts/Accounts.php b/modules/Accounts/Accounts.php
index cc964237fa8b6fc148bce3b83c9d5259983bf1e2..1076fcf2bf8ff991ec442748c651d93616f5db52 100644
--- a/modules/Accounts/Accounts.php
+++ b/modules/Accounts/Accounts.php
@@ -104,7 +104,7 @@ class Accounts extends CRMEntity {
);
function __construct()
{
- $this->log =VtigerLogger::getLogger('account');
+ $this->log =Logger::getLogger('account');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Accounts');
}
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index 81d308b823cb58c2d5343e5b30b83cbd4f09f464..5e6eaf2e962eb8b54a0e06122f54ce23bedd2370 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -105,7 +105,7 @@ class Activity extends CRMEntity {
//var $groupTable = Array('vtiger_activitygrouprelation','activityid');
function __construct()
{
- $this->log = VtigerLogger::getLogger('Calendar');
+ $this->log = Logger::getLogger('Calendar');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Calendar');
}
diff --git a/modules/Campaigns/Campaigns.php b/modules/Campaigns/Campaigns.php
index d9d85c29277dc84ec1356f84adcd44e2410ecf3d..50ad738b0ad7f8b66fdeb886d7dc106d97fe7311 100644
--- a/modules/Campaigns/Campaigns.php
+++ b/modules/Campaigns/Campaigns.php
@@ -69,7 +69,7 @@ class Campaigns extends CRMEntity {
// For Alphabetical search
var $def_basicsearch_col = 'campaignname';
function __construct() {
- $this->log =VtigerLogger::getLogger('campaign');
+ $this->log =Logger::getLogger('campaign');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Campaigns');
}
diff --git a/modules/Contacts/Contacts.php b/modules/Contacts/Contacts.php
index bd738be3370435ddd72fe7842f14e68d6823ec9d..422c092450a3c169f0e216e50e90b905c8ef0bdb 100644
--- a/modules/Contacts/Contacts.php
+++ b/modules/Contacts/Contacts.php
@@ -145,7 +145,7 @@ class Contacts extends CRMEntity {
'Vendors' => array('table_name' => 'vtiger_vendorcontactrel', 'table_index' => 'vendorid', 'rel_index' => 'contactid'),
);
function __construct() {
- $this->log = VtigerLogger::getLogger('contact');
+ $this->log = Logger::getLogger('contact');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Contacts');
}
diff --git a/modules/CustomView/ListViewTop.php b/modules/CustomView/ListViewTop.php
index 7b752d51b6ba3520ede81e6fd98f9ab7a6e72266..ece5d236996f89eae6da636c662473ed0b1269f7 100644
--- a/modules/CustomView/ListViewTop.php
+++ b/modules/CustomView/ListViewTop.php
@@ -60,7 +60,7 @@ function getKeyMetrics($maxval,$calCnt)
$metricviewnames = "'Hot Leads'";
$current_module_strings = return_module_language($current_language, "CustomView");
- $log = VtigerLogger::getLogger('metrics');
+ $log = Logger::getLogger('metrics');
$metriclists = getMetricList();
diff --git a/modules/Documents/Documents.php b/modules/Documents/Documents.php
index c605f67caa3810c8264556d00a591be628622cb0..646781b37f5fcfc2580d034d268bd2e1071e3e2b 100644
--- a/modules/Documents/Documents.php
+++ b/modules/Documents/Documents.php
@@ -72,7 +72,7 @@ class Documents extends CRMEntity {
var $default_sort_order = 'ASC';
function __construct() {
- $this->log = VtigerLogger::getLogger('notes');
+ $this->log = Logger::getLogger('notes');
$this->log->debug("Entering Documents() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Documents');
diff --git a/modules/Emails/Emails.php b/modules/Emails/Emails.php
index f591a85b6f0290c3e53820c812d70a90613c0f07..b2a924d64574d502511095eb5df39ef6c88dd466 100644
--- a/modules/Emails/Emails.php
+++ b/modules/Emails/Emails.php
@@ -68,9 +68,9 @@ class Emails extends CRMEntity {
/** This function will set the columnfields for Email module
*/
function __construct() {
- $this->log = VtigerLogger::getLogger('email');
+ $this->log = Logger::getLogger('email');
$this->log->debug("Entering Emails() method ...");
- $this->log = VtigerLogger::getLogger('email');
+ $this->log = Logger::getLogger('email');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Emails');
$this->log->debug("Exiting Email method ...");
diff --git a/modules/Faq/Faq.php b/modules/Faq/Faq.php
index 06c93d2097a7e4364e6d232940839c814cfa0d64..e5867d0a6626237b81fcd424d68985fc9b9d3ab1 100755
--- a/modules/Faq/Faq.php
+++ b/modules/Faq/Faq.php
@@ -80,7 +80,7 @@ class Faq extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('faq');
+ $this->log =Logger::getLogger('faq');
$this->log->debug("Entering Faq() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Faq');
diff --git a/modules/HelpDesk/HelpDesk.php b/modules/HelpDesk/HelpDesk.php
index bf2f8fd2efdf175cddbf5cbff267bd0b587db79f..84d0c413468d247f9ec5849699965b44ba30b097 100644
--- a/modules/HelpDesk/HelpDesk.php
+++ b/modules/HelpDesk/HelpDesk.php
@@ -101,7 +101,7 @@ class HelpDesk extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('helpdesk');
+ $this->log =Logger::getLogger('helpdesk');
$this->log->debug("Entering HelpDesk() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('HelpDesk');
diff --git a/modules/Invoice/Invoice.php b/modules/Invoice/Invoice.php
index 0e39c6353cdba808cd64909d0b5f2183015e0076..7850dcc0b6a2cf802128437c032ba51aeb947174 100755
--- a/modules/Invoice/Invoice.php
+++ b/modules/Invoice/Invoice.php
@@ -105,7 +105,7 @@ class Invoice extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('Invoice');
+ $this->log =Logger::getLogger('Invoice');
$this->log->debug("Entering Invoice() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Invoice');
diff --git a/modules/Leads/Leads.php b/modules/Leads/Leads.php
index f731614de3580213f06e635e8a21a473eb6e9148..0d366b3224572dfbcbeab4aa4725e1d05e3f1603 100755
--- a/modules/Leads/Leads.php
+++ b/modules/Leads/Leads.php
@@ -86,7 +86,7 @@ class Leads extends CRMEntity {
//var $groupTable = Array('vtiger_leadgrouprelation','leadid');
function __construct() {
- $this->log = VtigerLogger::getLogger('lead');
+ $this->log = Logger::getLogger('lead');
$this->log->debug("Entering Leads() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Leads');
diff --git a/modules/Potentials/Potentials.php b/modules/Potentials/Potentials.php
index 69da8b542faaf8c20e9a16ce59a9571d23fc66fa..128aeee76f528ba9e1874f50bebc3f80f6109cfc 100644
--- a/modules/Potentials/Potentials.php
+++ b/modules/Potentials/Potentials.php
@@ -93,7 +93,7 @@ class Potentials extends CRMEntity {
var $LBL_POTENTIAL_MAPPING = 'LBL_OPPORTUNITY_MAPPING';
//var $groupTable = Array('vtiger_potentialgrouprelation','potentialid');
function __construct() {
- $this->log = VtigerLogger::getLogger('potential');
+ $this->log = Logger::getLogger('potential');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Potentials');
}
diff --git a/modules/PriceBooks/PriceBooks.php b/modules/PriceBooks/PriceBooks.php
index 5b0511acadc3e0e64af75308bb8d02f958c95765..8bb2fc7ef0205673abe0b521ea693f62212aedb0 100755
--- a/modules/PriceBooks/PriceBooks.php
+++ b/modules/PriceBooks/PriceBooks.php
@@ -55,7 +55,7 @@ class PriceBooks extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('pricebook');
+ $this->log =Logger::getLogger('pricebook');
$this->log->debug("Entering PriceBooks() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('PriceBooks');
diff --git a/modules/Products/Products.php b/modules/Products/Products.php
index 9a6be7c0d16badbaeef92bcc192140dec20661e4..d39e6ce4c74b465521b249ba8f30a4f5fc5a93ff 100755
--- a/modules/Products/Products.php
+++ b/modules/Products/Products.php
@@ -74,7 +74,7 @@ class Products extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('product');
+ $this->log =Logger::getLogger('product');
$this->log->debug("Entering Products() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Products');
diff --git a/modules/PurchaseOrder/PurchaseOrder.php b/modules/PurchaseOrder/PurchaseOrder.php
index 730fdb4bf97c144ca4664cf194fc44d800cc5c35..625bcfb6265e7a1ccc7d0f1da361f2b9cfd26516 100644
--- a/modules/PurchaseOrder/PurchaseOrder.php
+++ b/modules/PurchaseOrder/PurchaseOrder.php
@@ -98,7 +98,7 @@ class PurchaseOrder extends CRMEntity {
* creates an instance for PearDatabase class and get values for column_fields array of Order class.
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('PurchaseOrder');
+ $this->log =Logger::getLogger('PurchaseOrder');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('PurchaseOrder');
}
diff --git a/modules/Quotes/Quotes.php b/modules/Quotes/Quotes.php
index 767e064940256dd7b82b58e92c70c24a6f91bbdc..21435be09db44aed8eaca813aac569503d0b674a 100755
--- a/modules/Quotes/Quotes.php
+++ b/modules/Quotes/Quotes.php
@@ -105,7 +105,7 @@ class Quotes extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('quote');
+ $this->log =Logger::getLogger('quote');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Quotes');
}
diff --git a/modules/Reports/ReportSharing.php b/modules/Reports/ReportSharing.php
index b8f29131eae4e24f29d8775824ac9bed5fda814f..b0d4375ccd51b4d347b91c96bf945436ccd561a1 100644
--- a/modules/Reports/ReportSharing.php
+++ b/modules/Reports/ReportSharing.php
@@ -21,7 +21,7 @@ $current_module_strings = return_module_language($current_language, 'Reports');
global $list_max_entries_per_page;
global $urlPrefix;
-$log = VtigerLogger::getLogger('report_type');
+$log = Logger::getLogger('report_type');
global $currentModule;
global $image_path;
global $theme;
diff --git a/modules/Reports/ReportType.php b/modules/Reports/ReportType.php
index f580678ecd9a6c2ac0c0f09b8234591a518daffb..0e14e9fc8bbde85fd0dad8d73f11136cc568b1c3 100644
--- a/modules/Reports/ReportType.php
+++ b/modules/Reports/ReportType.php
@@ -21,7 +21,7 @@ $current_module_strings = return_module_language($current_language, 'Reports');
global $list_max_entries_per_page;
global $urlPrefix;
-$log = VtigerLogger::getLogger('report_type');
+$log = Logger::getLogger('report_type');
global $currentModule;
global $image_path;
diff --git a/modules/SalesOrder/SalesOrder.php b/modules/SalesOrder/SalesOrder.php
index b60a23448501634cbca7b083fee163f499eae73c..c7ca1a6d94c296ae3b9621e05cbfdcfed8a5cdd5 100644
--- a/modules/SalesOrder/SalesOrder.php
+++ b/modules/SalesOrder/SalesOrder.php
@@ -107,7 +107,7 @@ class SalesOrder extends CRMEntity {
* creates an instance for PearDatabase class and get values for column_fields array of SalesOrder class.
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('SalesOrder');
+ $this->log =Logger::getLogger('SalesOrder');
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('SalesOrder');
}
diff --git a/modules/Users/DefaultDataPopulator.php b/modules/Users/DefaultDataPopulator.php
index 3c2d20c7b20ff4d7d99d041b7bdf2a22de7550ee..6b97a414c4b372cf6527162a90a703a5e0c6a45c 100644
--- a/modules/Users/DefaultDataPopulator.php
+++ b/modules/Users/DefaultDataPopulator.php
@@ -18,7 +18,7 @@ require_once('include/utils/utils.php');
class DefaultDataPopulator extends CRMEntity {
function __construct() {
- $this->log = VtigerLogger::getLogger('DefaultDataPopulator');
+ $this->log = Logger::getLogger('DefaultDataPopulator');
$this->db = PearDatabase::getInstance();
}
function DefaultDataPopulator() {
diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index c954519b14bcbfd9546276fe2d606a7527327006..b0ad5bd58992e3ea6253da2f59808d1ae4b4b36b 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -133,7 +133,7 @@ class Users extends CRMEntity {
*
*/
function __construct() {
- $this->log = VtigerLogger::getLogger('user');
+ $this->log = Logger::getLogger('user');
$this->log->debug("Entering Users() method ...");
$this->db = PearDatabase::getInstance();
$this->DEFAULT_PASSWORD_CRYPT_TYPE = (version_compare(PHP_VERSION, '5.3.0') >= 0)? 'PHP5.3MD5': 'MD5';
diff --git a/modules/Vendors/Vendors.php b/modules/Vendors/Vendors.php
index fdb4d8899632ef142314fbba6b9f960685b078f8..abe9b79d294dc716bfd5e9ee775ddf025bc24b86 100755
--- a/modules/Vendors/Vendors.php
+++ b/modules/Vendors/Vendors.php
@@ -65,7 +65,7 @@ class Vendors extends CRMEntity {
/** Constructor which will set the column_fields in this object
*/
function __construct() {
- $this->log =VtigerLogger::getLogger('vendor');
+ $this->log =Logger::getLogger('vendor');
$this->log->debug("Entering Vendors() method ...");
$this->db = PearDatabase::getInstance();
$this->column_fields = getColumnFields('Vendors');
diff --git a/modules/Vtiger/helpers/VtigerLogger.php b/modules/Vtiger/helpers/Logger.php
similarity index 51%
rename from modules/Vtiger/helpers/VtigerLogger.php
rename to modules/Vtiger/helpers/Logger.php
index c4b14834b8d2464abcc474a3fbaa7ed2deb24a7a..f2fd2b0e5947d33b5f12ed4b8edc9990ac6f4832 100644
--- a/modules/Vtiger/helpers/VtigerLogger.php
+++ b/modules/Vtiger/helpers/Logger.php
@@ -1,37 +1,56 @@
<?php
-/*+**********************************************************************************
+
+/* +**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
- ************************************************************************************/
+ * ********************************************************************************** */
require 'vendor/autoload.php';
-use Monolog\Logger;
+use Monolog\Logger as MonologLogger;
use Monolog\Handler\StreamHandler;
-class VtigerLogger {
-
- static $filePath = '';
- static $logLevel = '';
+class Logger {
+
+ private static $logLevel;
+ private static $filePath;
+ private static $initialized = false;
+
+ public function __construct() {
+ if (!self::$initialized) {
+ global $PERFORMANCE_CONFIG;
+ if (isset($PERFORMANCE_CONFIG) && isset($PERFORMANCE_CONFIG['LOGLEVEl_DEBUG']) && $PERFORMANCE_CONFIG['LOGLEVEl_DEBUG']) {
+ self::$logLevel = 100; // Default log file path.;
+ self::$filePath = "logs/vtigercrm.log";
+ self::$initialized = true;
+ }
+ }
+ }
+
public static function getLogger(string $channel, $customFormatter = true) {
$log = new self();
- if(self::$logLevel) {
- $log = new Logger($channel);
+ if (self::$logLevel) {
+ $log = new MonologLogger($channel);
$handler = new StreamHandler(self::$filePath, self::$logLevel);
- if($customFormatter) {
+ if ($customFormatter) {
$handler->setFormatter(new VtigerCustomFormatter());
}
$log->pushHandler($handler);
}
return $log;
+ }
+
+ public function info($message) {
+
+ }
+
+ public function debug($message) {
}
- public function info($message) { }
- public function debug($message) { }
}
use Monolog\Formatter\FormatterInterface;
@@ -40,7 +59,7 @@ class VtigerCustomFormatter implements FormatterInterface {
public function format(Monolog\LogRecord $record) {
$record = $record->toArray();
- $formatted = '[' . date('Y-m-d H:i:s') . '] - ' .$record['level_name'].' - '.$record['channel'].' - '.$record['message'] . PHP_EOL;
+ $formatted = '[' . date('Y-m-d H:i:s') . '] - ' . $record['level_name'] . ' - ' . $record['channel'] . ' - ' . $record['message'] . PHP_EOL;
return $formatted;
}
diff --git a/modules/Vtiger/layout_utils.php b/modules/Vtiger/layout_utils.php
index 37060baec4cc793ef9ec6332633d53f543fd30c3..f65fff9fc92fdb195237458b0458e2a74444352b 100644
--- a/modules/Vtiger/layout_utils.php
+++ b/modules/Vtiger/layout_utils.php
@@ -22,7 +22,7 @@
require_once('include/logging.php');
global $app_strings;
-$log = VtigerLogger::getLogger('layout_utils');
+$log = Logger::getLogger('layout_utils');
/**
* Create HTML to display formatted form title of a form in the left pane
diff --git a/webservice.php b/webservice.php
index b17c5889b19f8250fd8b72489630231ac12ee0a1..98edfe4f3b0c1e84c99dd8c26febee4b0b6a0f61 100644
--- a/webservice.php
+++ b/webservice.php
@@ -36,8 +36,8 @@ require_once("config.php");
$API_VERSION = "0.22";
global $seclog,$log;
- $seclog = VtigerLogger::getLogger('SECURITY');
- $log = VtigerLogger::getLogger('webservice');
+ $seclog = Logger::getLogger('SECURITY');
+ $log = Logger::getLogger('webservice');
function getRequestParamsArrayForOperation($operation){
global $operationInput;