From 64ab1979db23c984cb29f4d6e984369b938e5016 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 10:50:22 -0700 Subject: maint-6633: fix ordering of log entries --- indra/llcommon/llerror.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 5ed348e13c..345ec3661b 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -921,11 +921,6 @@ namespace std::ostringstream message_stream; - if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation)) - { - message_stream << site.mLocationString << " "; - } - if (show_time && r->wantsTime() && s->mTimeFunction != NULL) { message_stream << s->mTimeFunction() << " "; @@ -940,6 +935,11 @@ namespace { message_stream << site.mTagString; } + + if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation)) + { + message_stream << site.mLocationString << " "; + } if ((show_level && r->wantsLevel())|| (show_tags && r->wantsTags())) { -- cgit v1.2.3 From 972b0b2f1bfcad32f2a12b613d4a249658895715 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 12:31:01 -0700 Subject: maint-6633: fix unit test to conform with new desired ordering --- indra/llcommon/tests/llerror_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index f51279e817..404f3e51ae 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -551,9 +551,9 @@ namespace tut function; writeReturningLocationAndFunction(location, function); - ensure_equals("order is location time type function message", + ensure_equals("order is time location type function message", message(0), - location + roswell() + " INFO: " + function + ": apple"); + roswell() + lcoation + " INFO: " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From c39b7f2d88f1e345a0a202b9a624d973bc8c97de Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 13:37:42 -0700 Subject: maint-6633: fix tyop --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 404f3e51ae..b5bd6a7c9e 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + lcoation + " INFO: " + function + ": apple"); + roswell() + location + " INFO: " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From acfbcc73527c85399ebfa750f2cd377debd12cd2 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 14:15:29 -0700 Subject: maint-6633: move INFO around --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index b5bd6a7c9e..b20345d50e 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + location + " INFO: " + function + ": apple"); + roswell() + " INFO:" + location + function + ": apple"); } template<> template<> -- cgit v1.2.3 From cea2e4a7ad0f340c8bc582030490eee1099f19bf Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 15:14:46 -0700 Subject: maint-6633: fix spacing --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index b20345d50e..8e79da9834 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + " INFO:" + location + function + ": apple"); + roswell() + " INFO:" + location + " " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From 22ac9a10d8ecc8a978eaaa4ef05cfcdaea1e7604 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 16:03:10 -0700 Subject: maint-6633: fix spacing after level: --- indra/llcommon/llerror.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 345ec3661b..5129cdfde9 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -928,7 +928,7 @@ namespace if (show_level && r->wantsLevel()) { - message_stream << site.mLevelString; + message_stream << site.mLevelString << " "; } if (show_tags && r->wantsTags()) @@ -936,10 +936,11 @@ namespace message_stream << site.mTagString; } - if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation)) - { - message_stream << site.mLocationString << " "; - } + if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation)) + { + message_stream << site.mLocationString << " "; + } + if ((show_level && r->wantsLevel())|| (show_tags && r->wantsTags())) { -- cgit v1.2.3 From 0a55b1d0221744a6e113459e32c3e0e7ec04a44f Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 19:27:12 -0700 Subject: maint-6633: more futzing with spaces --- indra/llcommon/llerror.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 5129cdfde9..79a753d5bd 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -949,7 +949,7 @@ namespace if (show_function && r->wantsFunctionName()) { - message_stream << site.mFunctionString << " "; + message_stream << site.mFunctionString;// << " "; } message_stream << message; -- cgit v1.2.3 From f447cf72239723b312bf3dad50cdcd9e5be1f574 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 11 Oct 2016 08:16:25 -0700 Subject: maint-6633: yet more futzing with spaces --- indra/llcommon/llerror.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 79a753d5bd..37654411d6 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -941,15 +941,15 @@ namespace message_stream << site.mLocationString << " "; } - if ((show_level && r->wantsLevel())|| + /*if ((show_level && r->wantsLevel())|| (show_tags && r->wantsTags())) { message_stream << " "; - } + }*/ if (show_function && r->wantsFunctionName()) { - message_stream << site.mFunctionString;// << " "; + message_stream << site.mFunctionString << " "; } message_stream << message; -- cgit v1.2.3 From e6043fad2ab549a16f1bf4e81851357de4995862 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 11 Oct 2016 09:21:33 -0700 Subject: maint-6633: space after colon --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 8e79da9834..64624fc6c2 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + " INFO:" + location + " " + function + ": apple"); + roswell() + " INFO: " + location + " " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From 19f576872aec60aae359e567cdd80f3d081b2b73 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 11 Oct 2016 11:41:25 -0700 Subject: maint-6633: space, the final frontier --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 64624fc6c2..364d2d13dd 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + " INFO: " + location + " " + function + ": apple"); + roswell() + " INFO: " + location + function + ": apple"); } template<> template<> -- cgit v1.2.3 From d68befaced94f1d0ef5879ab3db307f3327588ab Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 11 Oct 2016 13:28:30 -0700 Subject: maint-6633: remove commented out code --- indra/llcommon/llerror.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 37654411d6..6a62860c3f 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -941,12 +941,6 @@ namespace message_stream << site.mLocationString << " "; } - /*if ((show_level && r->wantsLevel())|| - (show_tags && r->wantsTags())) - { - message_stream << " "; - }*/ - if (show_function && r->wantsFunctionName()) { message_stream << site.mFunctionString << " "; -- cgit v1.2.3