ticket #329

logger output problem fixed

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-shamshel-PT@7459 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/logger/logger_impl.cpp b/logger/logger_impl.cpp
index 780d2c3..5a4da33 100644 (file)
--- a/logger/logger_impl.cpp
+++ b/logger/logger_impl.cpp
@@ -1014,33 +1014,16 @@ void l7vs::LoggerImpl::loadConf(){
                log4cxx::LayoutPtr layout =\r
                        new log4cxx::PatternLayout(LOGGER_LAYOUT);\r
 \r
-               for( category_level_map_type::iterator cat_itr = category_level_map.begin();\r
-                        cat_itr != category_level_map.end();\r
-                        ++cat_itr ){\r
-\r
-                       category_name_map_type::iterator name_itr = category_name_map.find( cat_itr->first );\r
-                       log4cxx::LoggerPtr cat_logger = log4cxx::Logger::getLogger( name_itr->second );\r
-                       if (0 == cat_logger) {\r
-                               throw std::logic_error("getLogger Failed.");\r
-                       }\r
+               log4cxx::rolling::RollingFileAppenderPtr        normalAppender;\r
+               log4cxx::rolling::RollingFileAppenderPtr        accessAppender;\r
+               \r
+               for( int appender_count = 0 ; appender_count < 2; ++appender_count ){\r
+                       if( "" == property->log_filename_key )  break;  // no conn_log setting.\r
 \r
-#if    defined(LOGGER_PROCESS_VSD)\r
-                       if( cat_itr->first == LOG_CAT_L7VSD_NETWORK_ACCESS )\r
-                               property = &access_log_property;\r
-                       else\r
+                       if( 0 == appender_count )\r
                                property = &normal_log_property;\r
-#elif defined(LOGGER_PROCESS_ADM)\r
-                       property = &normal_log_property;\r
-#elif defined(LOGGER_PROCESS_SNM)\r
-                       property = &normal_log_property;\r
-#elif defined(LOGGER_PROCESS_SSL)\r
-                       if( cat_itr->first == LOG_CAT_SSLPROXY_CONNECTION )\r
-                               property = &access_log_property;\r
                        else\r
-                               property = &normal_log_property;\r
-#else\r
-                       property = &normal_log_property;\r
-#endif\r
+                               property = &access_log_property;\r
 \r
                        switch (property->rotation_value) {\r
                        case LOG_ROT_SIZE:\r
@@ -1094,8 +1077,12 @@ void l7vs::LoggerImpl::loadConf(){
                                        sizeAppender->activateOptions(pool);\r
                \r
                                        // add size_base_appender to CategoryLogger\r
-                                       cat_logger->addAppender(sizeAppender);\r
-       \r
+                                       //cat_logger->addAppender(sizeAppender);\r
+                                       if( 0 == appender_count )\r
+                                               normalAppender = sizeAppender;\r
+                                       else\r
+                                               accessAppender = sizeAppender;\r
+\r
                                        break;\r
                                }\r
                        case LOG_ROT_DATE:\r
@@ -1145,8 +1132,12 @@ void l7vs::LoggerImpl::loadConf(){
                                        dateAppender->activateOptions(pool);\r
                \r
                                        // add date_based_appender to CategoryLogger\r
-                                       cat_logger->addAppender(dateAppender);\r
-       \r
+                                       //cat_logger->addAppender(dateAppender);\r
+                                       if( 0 == appender_count )\r
+                                               normalAppender = dateAppender;\r
+                                       else\r
+                                               accessAppender = dateAppender;\r
+\r
                                        break;\r
                                }\r
                        default:        //LOG_ROT_DATESIZE:\r
@@ -1199,9 +1190,55 @@ void l7vs::LoggerImpl::loadConf(){
                                        dateSizeAppender->activateOptions(pool);\r
                \r
                                        // add time_and_size_based_appender to CategoryLogger\r
-                                       cat_logger->addAppender(dateSizeAppender);\r
+                                       //cat_logger->addAppender(dateSizeAppender);\r
+                                       if( 0 == appender_count )\r
+                                               normalAppender = dateSizeAppender;\r
+                                       else\r
+                                               accessAppender = dateSizeAppender;\r
+\r
                                }\r
                        }       //switch\r
+               }       //for \r
+\r
+               for( category_level_map_type::iterator cat_itr = category_level_map.begin();\r
+                        cat_itr != category_level_map.end();\r
+                        ++cat_itr ){\r
+\r
+                       category_name_map_type::iterator name_itr = category_name_map.find( cat_itr->first );\r
+                       log4cxx::LoggerPtr cat_logger = log4cxx::Logger::getLogger( name_itr->second );\r
+                       if (0 == cat_logger) {\r
+                               throw std::logic_error("getLogger Failed.");\r
+                       }\r
+\r
+#if    defined(LOGGER_PROCESS_VSD)\r
+                       if( cat_itr->first == LOG_CAT_L7VSD_NETWORK_ACCESS ){\r
+                               //property = &access_log_property;\r
+                               cat_logger->addAppender(accessAppender);\r
+                       }\r
+                       else{\r
+                               //property = &normal_log_property;\r
+                               cat_logger->addAppender(normalAppender);\r
+                       }\r
+#elif defined(LOGGER_PROCESS_ADM)\r
+                       //property = &normal_log_property;\r
+                       cat_logger->addAppender(normalAppender);\r
+#elif defined(LOGGER_PROCESS_SNM)\r
+                       //property = &normal_log_property;\r
+                       cat_logger->addAppender(normalAppender);\r
+#elif defined(LOGGER_PROCESS_SSL)\r
+                       if( cat_itr->first == LOG_CAT_SSLPROXY_CONNECTION ){\r
+                               //property = &access_log_property;\r
+                               cat_logger->addAppender(accessAppender);\r
+                       }\r
+                       else{\r
+                               //property = &normal_log_property;\r
+                               cat_logger->addAppender(normalAppender);\r
+                       }\r
+#else\r
+                       //property = &normal_log_property;\r
+                       cat_logger->addAppender(normalAppender);\r
+#endif\r
+\r
 \r
                        //default log level settting\r
                        cat_itr->second = LOG_LV_INFO;\r