From 16352fc10c1a6df5b67e495982477b0bd4507968 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 31 Oct 2014 10:27:17 +0100 Subject: [PATCH] Move Logger to the Application namespace fixes #7148 --- .../controllers/AuthenticationController.php | 2 +- application/controllers/DashboardController.php | 2 +- application/controllers/ErrorController.php | 2 +- application/controllers/FilterController.php | 2 +- application/controllers/ListController.php | 4 +--- application/controllers/StaticController.php | 2 +- .../forms/Config/General/LoggingConfigForm.php | 2 +- application/forms/PreferenceForm.php | 2 +- .../Icinga/Application/ApplicationBootstrap.php | 2 +- library/Icinga/Application/Cli.php | 2 +- .../Icinga/{Logger => Application}/Logger.php | 16 ++++++++-------- .../{ => Application}/Logger/LogWriter.php | 2 +- .../Logger/Writer/FileWriter.php | 6 +++--- .../Logger/Writer/SyslogWriter.php | 6 +++--- library/Icinga/Application/Modules/Manager.php | 2 +- library/Icinga/Application/Modules/Module.php | 2 +- library/Icinga/Application/Web.php | 2 +- library/Icinga/Authentication/AuthChain.php | 2 +- .../Authentication/Backend/LdapUserBackend.php | 2 +- library/Icinga/Authentication/Manager.php | 2 +- library/Icinga/Protocol/Ldap/Connection.php | 2 +- library/Icinga/Web/Hook.php | 2 +- library/Icinga/Web/Menu.php | 2 +- library/Icinga/Web/MenuRenderer.php | 2 +- library/Icinga/Web/Notification.php | 2 +- library/Icinga/Web/Session/PhpSession.php | 2 +- library/Icinga/Web/Widget/Chart/InlinePie.php | 2 +- .../controllers/CommandController.php | 2 +- .../Backend/Ido/Query/GroupsummaryQuery.php | 2 +- .../Monitoring/Backend/Ido/Query/IdoQuery.php | 2 +- .../Command/Transport/LocalCommandFile.php | 2 +- .../Command/Transport/RemoteCommandFile.php | 2 +- .../Icinga/Logger/Writer/StreamWriterTest.php | 4 ++-- 33 files changed, 45 insertions(+), 47 deletions(-) rename library/Icinga/{Logger => Application}/Logger.php (93%) rename library/Icinga/{ => Application}/Logger/LogWriter.php (92%) rename library/Icinga/{ => Application}/Logger/Writer/FileWriter.php (94%) rename library/Icinga/{ => Application}/Logger/Writer/SyslogWriter.php (92%) diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index 8b2bb3715..1d47a7d41 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -9,7 +9,7 @@ use Icinga\Web\Controller\ActionController; use Icinga\Form\Authentication\LoginForm; use Icinga\Authentication\AuthChain; use Icinga\Application\Config; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Exception\AuthenticationException; use Icinga\Exception\NotReadableError; use Icinga\Exception\ConfigurationError; diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 4942f5cdb..db5978c19 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -3,7 +3,7 @@ // {{{ICINGA_LICENSE_HEADER}}} use Icinga\Web\Url; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Config\PreservingIniWriter; use Icinga\Application\Config as IcingaConfig; use Icinga\Web\Widget\Dashboard; diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php index 074e2fdc2..23051bd9a 100644 --- a/application/controllers/ErrorController.php +++ b/application/controllers/ErrorController.php @@ -4,7 +4,7 @@ // namespace Icinga\Application\Controllers; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Web\Controller\ActionController; use Icinga\Application\Icinga; diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php index 2ffa869db..09e8f0368 100644 --- a/application/controllers/FilterController.php +++ b/application/controllers/FilterController.php @@ -4,7 +4,7 @@ use Icinga\Web\Controller\ActionController; use Icinga\Filter\Filter; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; /** * Application wide interface for filtering diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 004c52148..8f9a39e1b 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -5,9 +5,7 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Web\Hook; use Icinga\Web\Url; -use Icinga\Data\ResourceFactory; -use Icinga\Logger\Logger; -use Icinga\Logger\Writer\FileWriter; +use Icinga\Application\Logger; use Icinga\Protocol\File\FileReader; use \Zend_Controller_Action_Exception as ActionError; diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php index c8b1d9b73..fc5f1354f 100644 --- a/application/controllers/StaticController.php +++ b/application/controllers/StaticController.php @@ -4,7 +4,7 @@ use Icinga\Web\Controller\ActionController; use Icinga\Application\Icinga; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Web\FileCache; use Zend_Controller_Action_Exception as ActionException; diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php index 733c306b9..50b61d246 100644 --- a/application/forms/Config/General/LoggingConfigForm.php +++ b/application/forms/Config/General/LoggingConfigForm.php @@ -5,7 +5,7 @@ namespace Icinga\Form\Config\General; use Icinga\Application\Icinga; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Web\Form; use Icinga\Web\Form\Validator\WritablePathValidator; diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php index 0b1ba9a9b..633e2183a 100644 --- a/application/forms/PreferenceForm.php +++ b/application/forms/PreferenceForm.php @@ -6,7 +6,7 @@ namespace Icinga\Form; use Exception; use DateTimeZone; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\User\Preferences; use Icinga\User\Preferences\PreferencesStore; use Icinga\Util\TimezoneDetect; diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 958642940..368c93a8f 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -11,7 +11,7 @@ use Icinga\Application\Modules\Manager as ModuleManager; use Icinga\Data\ResourceFactory; use Icinga\Exception\ConfigurationError; use Icinga\Exception\NotReadableError; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Util\DateTimeFactory; use Icinga\Util\Translator; use Icinga\Exception\IcingaException; diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php index d329ce439..e82eaabbb 100644 --- a/library/Icinga/Application/Cli.php +++ b/library/Icinga/Application/Cli.php @@ -9,7 +9,7 @@ use Icinga\Application\ApplicationBootstrap; use Icinga\Cli\Params; use Icinga\Cli\Loader; use Icinga\Cli\Screen; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Application\Benchmark; use Icinga\Exception\ProgrammingError; use Zend_Config; diff --git a/library/Icinga/Logger/Logger.php b/library/Icinga/Application/Logger.php similarity index 93% rename from library/Icinga/Logger/Logger.php rename to library/Icinga/Application/Logger.php index a5458e498..cb06ef8c3 100644 --- a/library/Icinga/Logger/Logger.php +++ b/library/Icinga/Application/Logger.php @@ -2,13 +2,13 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Logger; +namespace Icinga\Application; use Exception; use Zend_Config; +use Icinga\Application\Logger\Writer\FileWriter; +use Icinga\Application\Logger\Writer\SyslogWriter; use Icinga\Exception\ConfigurationError; -use Icinga\Logger\Writer\FileWriter; -use Icinga\Logger\Writer\SyslogWriter; /** * Logger @@ -57,7 +57,7 @@ class Logger /** * Log writer * - * @var \Icinga\Logger\LogWriter + * @var \Icinga\Application\Logger\LogWriter */ protected $writer; @@ -133,12 +133,12 @@ class Logger * * @param Zend_Config $config The configuration to initialize the writer with * - * @return \Icinga\Logger\LogWriter The requested log writer - * @throws ConfigurationError If the requested writer cannot be found + * @return \Icinga\Application\Logger\LogWriter The requested log writer + * @throws ConfigurationError If the requested writer cannot be found */ protected function createWriter(Zend_Config $config) { - $class = 'Icinga\\Logger\\Writer\\' . ucfirst(strtolower($config->log)) . 'Writer'; + $class = 'Icinga\\Application\\Logger\\Writer\\' . ucfirst(strtolower($config->log)) . 'Writer'; if (! class_exists($class)) { throw new ConfigurationError( 'Cannot find log writer of type "%s"', @@ -258,7 +258,7 @@ class Logger /** * Get the log writer to use * - * @return \Icinga\Logger\LogWriter + * @return \Icinga\Application\Logger\LogWriter */ public function getWriter() { diff --git a/library/Icinga/Logger/LogWriter.php b/library/Icinga/Application/Logger/LogWriter.php similarity index 92% rename from library/Icinga/Logger/LogWriter.php rename to library/Icinga/Application/Logger/LogWriter.php index 3222e50be..370af35c1 100644 --- a/library/Icinga/Logger/LogWriter.php +++ b/library/Icinga/Application/Logger/LogWriter.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Logger; +namespace Icinga\Application\Logger; use Zend_Config; diff --git a/library/Icinga/Logger/Writer/FileWriter.php b/library/Icinga/Application/Logger/Writer/FileWriter.php similarity index 94% rename from library/Icinga/Logger/Writer/FileWriter.php rename to library/Icinga/Application/Logger/Writer/FileWriter.php index 527358e1c..220b9be79 100644 --- a/library/Icinga/Logger/Writer/FileWriter.php +++ b/library/Icinga/Application/Logger/Writer/FileWriter.php @@ -2,13 +2,13 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Logger\Writer; +namespace Icinga\Application\Logger\Writer; use Exception; use Zend_Config; +use Icinga\Application\Logger; +use Icinga\Application\Logger\LogWriter; use Icinga\Exception\ConfigurationError; -use Icinga\Logger\Logger; -use Icinga\Logger\LogWriter; use Icinga\Util\File; /** diff --git a/library/Icinga/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php similarity index 92% rename from library/Icinga/Logger/Writer/SyslogWriter.php rename to library/Icinga/Application/Logger/Writer/SyslogWriter.php index f67c618d2..9a5ac28e5 100644 --- a/library/Icinga/Logger/Writer/SyslogWriter.php +++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php @@ -2,11 +2,11 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Logger\Writer; +namespace Icinga\Application\Logger\Writer; use Zend_Config; -use Icinga\Logger\Logger; -use Icinga\Logger\LogWriter; +use Icinga\Application\Logger; +use Icinga\Application\Logger\LogWriter; /** * Log to the syslog service diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php index 60c2ee85b..db6f0e527 100644 --- a/library/Icinga/Application/Modules/Manager.php +++ b/library/Icinga/Application/Modules/Manager.php @@ -6,7 +6,7 @@ namespace Icinga\Application\Modules; use Icinga\Application\ApplicationBootstrap; use Icinga\Application\Icinga; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Data\SimpleQuery; use Icinga\Exception\ConfigurationError; diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index b1b051a6c..b97483f95 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -12,7 +12,7 @@ use Zend_Controller_Router_Route_Regex as RegexRoute; use Icinga\Application\ApplicationBootstrap; use Icinga\Application\Config; use Icinga\Application\Icinga; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Util\Translator; use Icinga\Web\Hook; use Icinga\Web\Menu; diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index 89cad22ab..d43b1d34d 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -9,7 +9,7 @@ require_once __DIR__ . '/ApplicationBootstrap.php'; use Icinga\Authentication\Manager as AuthenticationManager; use Icinga\Exception\ConfigurationError; use Icinga\Exception\NotReadableError; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Util\TimezoneDetect; use Icinga\Web\Request; use Icinga\Web\Response; diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php index 4ab87f7ae..12c7143bf 100644 --- a/library/Icinga/Authentication/AuthChain.php +++ b/library/Icinga/Authentication/AuthChain.php @@ -6,7 +6,7 @@ namespace Icinga\Authentication; use Iterator; use Zend_Config; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Exception\ConfigurationError; /** diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php index 3ee3c17dd..b859dfb3d 100644 --- a/library/Icinga/Authentication/Backend/LdapUserBackend.php +++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php @@ -4,7 +4,7 @@ namespace Icinga\Authentication\Backend; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\User; use Icinga\Authentication\UserBackend; use Icinga\Protocol\Ldap\Connection; diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php index fa974546d..c7d03b16a 100644 --- a/library/Icinga/Authentication/Manager.php +++ b/library/Icinga/Authentication/Manager.php @@ -9,7 +9,7 @@ use Zend_Config; use Icinga\Application\Config; use Icinga\Exception\IcingaException; use Icinga\Exception\NotReadableError; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\User; use Icinga\User\Preferences; use Icinga\User\Preferences\PreferencesStore; diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php index 6fa41e2aa..8f5c14c4f 100644 --- a/library/Icinga/Protocol/Ldap/Connection.php +++ b/library/Icinga/Protocol/Ldap/Connection.php @@ -7,7 +7,7 @@ namespace Icinga\Protocol\Ldap; use Icinga\Protocol\Ldap\Exception as LdapException; use Icinga\Application\Platform; use Icinga\Application\Config; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Zend_Config; /** diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php index 36974fb5b..01d1e0e2c 100644 --- a/library/Icinga/Web/Hook.php +++ b/library/Icinga/Web/Hook.php @@ -5,7 +5,7 @@ namespace Icinga\Web; use Exception; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Exception\ProgrammingError; /** diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php index 305cdd705..870c2f1f3 100644 --- a/library/Icinga/Web/Menu.php +++ b/library/Icinga/Web/Menu.php @@ -9,7 +9,7 @@ use RecursiveIterator; use Zend_Config; use Icinga\Application\Config; use Icinga\Application\Icinga; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Exception\ConfigurationError; use Icinga\Exception\ProgrammingError; use Icinga\Web\Url; diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php index 2fbcedc01..bbd5c208d 100644 --- a/library/Icinga/Web/MenuRenderer.php +++ b/library/Icinga/Web/MenuRenderer.php @@ -6,7 +6,7 @@ namespace Icinga\Web; use Exception; use RecursiveIteratorIterator; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; /** * A renderer to draw a menu with its sub-menus using an unordered html list diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php index 178a07e0a..c85dbcc13 100644 --- a/library/Icinga/Web/Notification.php +++ b/library/Icinga/Web/Notification.php @@ -6,7 +6,7 @@ namespace Icinga\Web; use Icinga\Exception\ProgrammingError; use Icinga\Application\Platform; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Web\Session; /** diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php index 65f940a13..cb311cc4a 100644 --- a/library/Icinga/Web/Session/PhpSession.php +++ b/library/Icinga/Web/Session/PhpSession.php @@ -4,7 +4,7 @@ namespace Icinga\Web\Session; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Exception\ConfigurationError; /** diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php index 4b4409e78..d22923131 100644 --- a/library/Icinga/Web/Widget/Chart/InlinePie.php +++ b/library/Icinga/Web/Widget/Chart/InlinePie.php @@ -7,7 +7,7 @@ namespace Icinga\Web\Widget\Chart; use Icinga\Web\Widget\AbstractWidget; use Icinga\Web\Url; use Icinga\Util\Format; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; /** * A SVG-PieChart intended to be displayed as a small icon next to labels, to offer a better visualization of the diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php index 1aae9de20..77a963d94 100644 --- a/modules/monitoring/application/controllers/CommandController.php +++ b/modules/monitoring/application/controllers/CommandController.php @@ -4,7 +4,7 @@ use Icinga\Application\Icinga; use Icinga\Application\Config; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Module\Monitoring\Form\Command\DisableNotificationWithExpireForm; use Icinga\Module\Monitoring\Form\Command\SingleArgumentCommandForm; use Icinga\Web\Form; diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php index ab1947f7e..5a6bce41f 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Zend_Db_Select; class GroupSummaryQuery extends IdoQuery diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php index 06472b44d..c6dcbbeae 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query; use Icinga\Exception\IcingaException; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Data\Db\DbQuery; use Icinga\Exception\ProgrammingError; use Icinga\Application\Icinga; diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php index c3133d469..73a2e5288 100644 --- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php +++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php @@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Command\Transport; use Exception; use LogicException; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Module\Monitoring\Command\Exception\TransportException; use Icinga\Module\Monitoring\Command\IcingaCommand; use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer; diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php index d22e2c863..0e447a4f3 100644 --- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php +++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Command\Transport; use LogicException; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; use Icinga\Module\Monitoring\Command\Exception\TransportException; use Icinga\Module\Monitoring\Command\IcingaCommand; use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer; diff --git a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php index 11fec9740..9dd43ae83 100644 --- a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php +++ b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php @@ -5,9 +5,9 @@ namespace Tests\Icinga\Logger\Writer; use Zend_Config; -use Icinga\Logger\Logger; +use Icinga\Application\Logger; +use Icinga\Application\Logger\Writer\FileWriter; use Icinga\Test\BaseTestCase; -use Icinga\Logger\Writer\FileWriter; class StreamWriterTest extends BaseTestCase {