[icinga-checkins] icinga.org: icinga-web/master: fixed log, fixed data overflow on wrong ssh key

git at icinga.org git at icinga.org
Wed Aug 24 11:46:09 CEST 2011


Module: icinga-web
Branch: master
Commit: f34354e17cf77143cb8192d29a31bebd34e3dcac
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=f34354e17cf77143cb8192d29a31bebd34e3dcac

Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 11:42:03 2011 +0200

fixed log, fixed data overflow on wrong ssh key

---

 .../Commands/CommandDispatcherModel.class.php      |    2 +-
 app/modules/AppKit/models/LogParserModel.class.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/modules/Api/models/Commands/CommandDispatcherModel.class.php b/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
index b8be11c..0d1b31d 100644
--- a/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
+++ b/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
@@ -41,7 +41,7 @@ class Api_Commands_CommandDispatcherModel extends IcingaApiBaseModel implements
         try {
             $this->consoleContext->exec($cmd);
         } catch (Exception $e) {
-            print_r($e);
+           $this->context->getLoggerManager()->log("Sending command failed ".$e->getMessage() );
         }
     }
 
diff --git a/app/modules/AppKit/models/LogParserModel.class.php b/app/modules/AppKit/models/LogParserModel.class.php
index b97005b..c59d40f 100644
--- a/app/modules/AppKit/models/LogParserModel.class.php
+++ b/app/modules/AppKit/models/LogParserModel.class.php
@@ -81,7 +81,7 @@ class AppKit_LogParserModel extends AppKitBaseModel {
     }
 
     protected function getLogDir() {
-        return AppKitAgaviUtil::replaceConfigVars(AgaviConfig::get('core.log_dir'));
+        return AppKitAgaviUtil::replaceConfigVars(AgaviConfig::get('org.icinga.appkit.log_path'));
     }
 
     public function getLogFilesByName($name) {





More information about the icinga-checkins mailing list