Use logging macros for logs from Attribute class

mliszcz · bourtemb · commit 344e9b9e9db5 · 2020-02-12T09:09:30.000+01:00
diff --git a/cppapi/server/attribute.cpp b/cppapi/server/attribute.cpp
@@ -5399,22 +5399,19 @@ void Attribute::log_quality()
             switch(quality)
             {
                 case ATTR_INVALID:
-                if (dev->get_logger()->is_error_enabled())
-                    dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "INVALID quality for attribute " << name << endl;
-                break;
+                    DEV_ERROR_STREAM(dev) << "INVALID quality for attribute " << get_name() << std::endl;
+                    break;
 
                 case ATTR_CHANGING:
-                if (dev->get_logger()->is_info_enabled())
-                    dev->get_logger()->info_stream() << log4tango::LogInitiator::_begin_log << "CHANGING quality for attribute " << name << endl;
-                break;
+                    DEV_INFO_STREAM(dev) << "CHANGING quality for attribute " << get_name() << std::endl;
+                    break;
 
                 case ATTR_VALID:
-                if (dev->get_logger()->is_info_enabled())
-                    dev->get_logger()->info_stream() << log4tango::LogInitiator::_begin_log << "VALID quality for attribute " << name << endl;
-                break;
+                    DEV_INFO_STREAM(dev) << "INFO quality for attribute " << get_name() << std::endl;
+                    break;
 
                 default:
-                break;
+                    break;
             }
         }
         else
@@ -5426,28 +5423,23 @@ void Attribute::log_quality()
 
             if (alarm[min_level] == true)
             {
-                if (dev->get_logger()->is_error_enabled())
-                    dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MIN ALARM for attribute " << name << endl;
+                DEV_ERROR_STREAM(dev) << "MIN ALARM for attribute " << get_name() << std::endl;
             }
             else if (alarm[max_level] == true)
             {
-                if (dev->get_logger()->is_error_enabled())
-                    dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MAX ALARM for attribute " << name << endl;
+                DEV_ERROR_STREAM(dev) << "MAX ALARM for attribute " << get_name() << std::endl;
             }
             else if (alarm[rds] == true)
             {
-                if (dev->get_logger()->is_warn_enabled())
-                    dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "RDS (Read Different Set) ALARM for attribute " << name << endl;
+                DEV_WARN_STREAM(dev) << "RDS (Read Different Set) ALARM for attribute " << get_name() << std::endl;
             }
             else if (alarm[min_warn] == true)
             {
-               if (dev->get_logger()->is_warn_enabled())
-                    dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MIN WARNING for attribute " << name << endl;
+                DEV_WARN_STREAM(dev) << "MIN WARNING for attribute " << get_name() << std::endl;
             }
             else if (alarm[max_warn] == true)
             {
-               if (dev->get_logger()->is_warn_enabled())
-                    dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MAX WARNING for attribute " << name << endl;
+                DEV_WARN_STREAM(dev) << "MAX WARNING for attribute " << get_name() << std::endl;
             }
         }
     }
@@ -5462,28 +5454,23 @@ void Attribute::log_quality()
         {
             if (alarm[min_level] == true)
             {
-                if (dev->get_logger()->is_error_enabled())
-                    dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MIN ALARM for attribute " << name << endl;
+                DEV_ERROR_STREAM(dev) << "MIN ALARM for attribute " << get_name() << std::endl;
             }
             else if (alarm[max_level] == true)
             {
-                if (dev->get_logger()->is_error_enabled())
-                    dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MAX ALARM for attribute " << name << endl;
+                DEV_ERROR_STREAM(dev) << "MAX ALARM for attribute " << get_name() << std::endl;
             }
             else if (alarm[rds] == true)
             {
-                if (dev->get_logger()->is_warn_enabled())
-                    dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "RDS (Read Different Set) ALARM for attribute " << name << endl;
+                DEV_WARN_STREAM(dev) << "RDS (Read Different Set) ALARM for attribute " << get_name() << std::endl;
             }
             else if (alarm[min_warn] == true)
             {
-               if (dev->get_logger()->is_warn_enabled())
-                    dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MIN WARNING for attribute " << name << endl;
+                DEV_WARN_STREAM(dev) << "MIN WARNING for attribute " << get_name() << std::endl;
             }
             else if (alarm[max_warn] == true)
             {
-               if (dev->get_logger()->is_warn_enabled())
-                    dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MAX WARNING for attribute " << name << endl;
+                DEV_WARN_STREAM(dev) << "MAX WARNING for attribute " << get_name() << std::endl;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -5399,22 +5399,19 @@ void Attribute::log_quality()`
`5399`	`5399`	`switch(quality)`
`5400`	`5400`	`{`
`5401`	`5401`	`case ATTR_INVALID:`
`5402`		`- if (dev->get_logger()->is_error_enabled())`
`5403`		`- dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "INVALID quality for attribute " << name << endl;`
`5404`		`- break;`
	`5402`	`+ DEV_ERROR_STREAM(dev) << "INVALID quality for attribute " << get_name() << std::endl;`
	`5403`	`+ break;`
`5405`	`5404`
`5406`	`5405`	`case ATTR_CHANGING:`
`5407`		`- if (dev->get_logger()->is_info_enabled())`
`5408`		`- dev->get_logger()->info_stream() << log4tango::LogInitiator::_begin_log << "CHANGING quality for attribute " << name << endl;`
`5409`		`- break;`
	`5406`	`+ DEV_INFO_STREAM(dev) << "CHANGING quality for attribute " << get_name() << std::endl;`
	`5407`	`+ break;`
`5410`	`5408`
`5411`	`5409`	`case ATTR_VALID:`
`5412`		`- if (dev->get_logger()->is_info_enabled())`
`5413`		`- dev->get_logger()->info_stream() << log4tango::LogInitiator::_begin_log << "VALID quality for attribute " << name << endl;`
`5414`		`- break;`
	`5410`	`+ DEV_INFO_STREAM(dev) << "INFO quality for attribute " << get_name() << std::endl;`
	`5411`	`+ break;`
`5415`	`5412`
`5416`	`5413`	`default:`
`5417`		`- break;`
	`5414`	`+ break;`
`5418`	`5415`	`}`
`5419`	`5416`	`}`
`5420`	`5417`	`else`
`@@ -5426,28 +5423,23 @@ void Attribute::log_quality()`
`5426`	`5423`
`5427`	`5424`	`if (alarm[min_level] == true)`
`5428`	`5425`	`{`
`5429`		`- if (dev->get_logger()->is_error_enabled())`
`5430`		`- dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MIN ALARM for attribute " << name << endl;`
	`5426`	`+ DEV_ERROR_STREAM(dev) << "MIN ALARM for attribute " << get_name() << std::endl;`
`5431`	`5427`	`}`
`5432`	`5428`	`else if (alarm[max_level] == true)`
`5433`	`5429`	`{`
`5434`		`- if (dev->get_logger()->is_error_enabled())`
`5435`		`- dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MAX ALARM for attribute " << name << endl;`
	`5430`	`+ DEV_ERROR_STREAM(dev) << "MAX ALARM for attribute " << get_name() << std::endl;`
`5436`	`5431`	`}`
`5437`	`5432`	`else if (alarm[rds] == true)`
`5438`	`5433`	`{`
`5439`		`- if (dev->get_logger()->is_warn_enabled())`
`5440`		`- dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "RDS (Read Different Set) ALARM for attribute " << name << endl;`
	`5434`	`+ DEV_WARN_STREAM(dev) << "RDS (Read Different Set) ALARM for attribute " << get_name() << std::endl;`
`5441`	`5435`	`}`
`5442`	`5436`	`else if (alarm[min_warn] == true)`
`5443`	`5437`	`{`
`5444`		`- if (dev->get_logger()->is_warn_enabled())`
`5445`		`- dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MIN WARNING for attribute " << name << endl;`
	`5438`	`+ DEV_WARN_STREAM(dev) << "MIN WARNING for attribute " << get_name() << std::endl;`
`5446`	`5439`	`}`
`5447`	`5440`	`else if (alarm[max_warn] == true)`
`5448`	`5441`	`{`
`5449`		`- if (dev->get_logger()->is_warn_enabled())`
`5450`		`- dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MAX WARNING for attribute " << name << endl;`
	`5442`	`+ DEV_WARN_STREAM(dev) << "MAX WARNING for attribute " << get_name() << std::endl;`
`5451`	`5443`	`}`
`5452`	`5444`	`}`
`5453`	`5445`	`}`
`@@ -5462,28 +5454,23 @@ void Attribute::log_quality()`
`5462`	`5454`	`{`
`5463`	`5455`	`if (alarm[min_level] == true)`
`5464`	`5456`	`{`
`5465`		`- if (dev->get_logger()->is_error_enabled())`
`5466`		`- dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MIN ALARM for attribute " << name << endl;`
	`5457`	`+ DEV_ERROR_STREAM(dev) << "MIN ALARM for attribute " << get_name() << std::endl;`
`5467`	`5458`	`}`
`5468`	`5459`	`else if (alarm[max_level] == true)`
`5469`	`5460`	`{`
`5470`		`- if (dev->get_logger()->is_error_enabled())`
`5471`		`- dev->get_logger()->error_stream() << log4tango::LogInitiator::_begin_log << "MAX ALARM for attribute " << name << endl;`
	`5461`	`+ DEV_ERROR_STREAM(dev) << "MAX ALARM for attribute " << get_name() << std::endl;`
`5472`	`5462`	`}`
`5473`	`5463`	`else if (alarm[rds] == true)`
`5474`	`5464`	`{`
`5475`		`- if (dev->get_logger()->is_warn_enabled())`
`5476`		`- dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "RDS (Read Different Set) ALARM for attribute " << name << endl;`
	`5465`	`+ DEV_WARN_STREAM(dev) << "RDS (Read Different Set) ALARM for attribute " << get_name() << std::endl;`
`5477`	`5466`	`}`
`5478`	`5467`	`else if (alarm[min_warn] == true)`
`5479`	`5468`	`{`
`5480`		`- if (dev->get_logger()->is_warn_enabled())`
`5481`		`- dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MIN WARNING for attribute " << name << endl;`
	`5469`	`+ DEV_WARN_STREAM(dev) << "MIN WARNING for attribute " << get_name() << std::endl;`
`5482`	`5470`	`}`
`5483`	`5471`	`else if (alarm[max_warn] == true)`
`5484`	`5472`	`{`
`5485`		`- if (dev->get_logger()->is_warn_enabled())`
`5486`		`- dev->get_logger()->warn_stream() << log4tango::LogInitiator::_begin_log << "MAX WARNING for attribute " << name << endl;`
	`5473`	`+ DEV_WARN_STREAM(dev) << "MAX WARNING for attribute " << get_name() << std::endl;`
`5487`	`5474`	`}`
`5488`	`5475`	`}`
`5489`	`5476`	`}`