Added WrapLineLayoutRendererWrapper #1400

mathieubrun · 2016-04-25T22:18:53Z

Implementation following discussion on http://stackoverflow.com/questions/36788754/how-can-i-limit-the-length-of-a-line-in-nlog/36789394

304NotModified · 2016-04-26T07:26:00Z

Nice! Thanks!

304NotModified · 2016-04-26T16:01:02Z

needs some fix for .net35 ;)

LayoutRenderers\Wrappers\WrapLineLayoutRendererWrapper.cs(74,53): error CS1503: Argument 2: cannot convert from 'System.Collections.Generic.IEnumerable' to 'string[]' [C:\projects\nlog\src\NLog\NLog.netfx35.csproj

304NotModified · 2016-04-26T16:45:04Z

Fix PR: https://github.com/mathieubrun/NLog/pull/1

mathieubrun · 2016-04-26T18:06:47Z

@304NotModified I'll look into it. I also want to change a bit the MakeChunks method

304NotModified · 2016-04-26T18:55:53Z

See the PR is send to you

mathieubrun · 2016-04-26T19:07:00Z

Yes, thanks ! But I changed implementation to a simple StringBuilder. No need to split and join, much simplier :)

304NotModified · 2016-04-26T19:11:13Z

That's indeed also a nice solution, if no unneeded stringbuilder are created :)

mathieubrun · 2016-04-26T20:00:58Z

Done, waiting for AppVeyor to finish !

codecov-io · 2016-04-26T20:09:13Z

Current coverage is 75.49%

Merging #1400 into master will increase coverage by +0.31%

2 files in src/NLog/Targets were modified. more
- Misses -2
- Partials +3
- Hits +13
1 files in src/NLog were modified. more
- Hits +5
5 files (not in diff) in src/NLog/Time were modified. more
13 files (not in diff) in ...Log/Targets/Wrappers were modified. more
- Misses +1
- Partials +3
- Hits +25
22 files (not in diff) in src/NLog/Targets were modified. more
- Misses -14
- Partials +2
- Hits +76
5 files (not in diff) in ...g/LogReceiverService were modified. more
- Partials +1
- Hits +4
9 files (not in diff) in src/NLog/Layouts were modified. more
- Hits +4
14 files (not in diff) in ...utRenderers/Wrappers were modified. more
- Partials +1
- Hits +1
31 files (not in diff) in ...NLog/LayoutRenderers were modified. more
- Partials +6
- Hits +45
5 files (not in diff) in ...ernal/NetworkSenders were modified. more
- Misses +12
- Partials +2
- Hits +7

@@           master      #1400   diff @@
========================================
  Files         267        268     +1   
  Lines       15607      16016   +409   
  Methods         0          0          
  Branches     1642       1729    +87   
========================================
+ Hits        11732      12091   +359   
- Misses       3492       3516    +24   
- Partials      383        409    +26

Powered by Codecov. Last updated by e4d46be...e29b4f2

304NotModified · 2016-04-26T20:27:32Z

A stringbuilder approach is indeed nicer, but also a bit more work too do it right.

304NotModified · 2016-04-26T20:27:54Z

src/NLog/LayoutRenderers/Wrappers/WrapLineLayoutRendererWrapper.cs

+            var chunkLength = WrapLine;
+            var textLength = text.Length;
+
+            var sb = new StringBuilder(textLength);


building a stringbuilder isn't always needed

indeed. replaced by a string

304NotModified · 2016-04-28T17:43:39Z

Why is the string builder totally removed? I think we had a miscommunication!

The new stringbuilder wasn't needed if the line didn't need a wrap (e.g. length of 70). But in other cases a stringbuilder is more preferred than string concats

mathieubrun · 2016-04-28T19:42:17Z

Ahah sorry, I understood to remove it fully :) I put it back

304NotModified · 2016-05-01T08:43:51Z

src/NLog/LayoutRenderers/Wrappers/WrapLineLayoutRendererWrapper.cs

+            if (text.Length <= chunkLength) return text;
+
+            // preallocate correct number of chars
+            var result = new StringBuilder(text.Length + (text.Length / chunkLength) * Environment.NewLine.Length);


304NotModified · 2016-05-01T08:45:57Z

Looks really good! This PR is Almost done!

Added some minor notes.

304NotModified · 2016-05-02T18:31:15Z

I think I can merge this after we added some docs to the wiki?

mathieubrun · 2016-05-02T19:48:56Z

I can write the new page, then you can link it on the https://github.com/NLog/NLog/wiki/Layout-Renderers page ?

304NotModified · 2016-05-02T19:52:38Z

that would be great!

mathieubrun · 2016-05-02T20:13:11Z

There you go : https://github.com/NLog/NLog/wiki/WrapLine-layout-renderer

I added tests for 2 other syntaxes :

${wrapline:${message}}
${wrapline:Inner=${message}:WrapLine=80}

mathieubrun · 2016-05-02T20:45:49Z

I have no idea WHY commit 80f9e7d went without the method names...

304NotModified · 2016-05-02T21:22:27Z

lol that's weird indeed.

304NotModified · 2016-05-04T19:57:23Z

Thanks for this great submit!

mathieubrun · 2016-05-06T19:30:40Z

You're welcome ! I'll look if there are others I can help with !

304NotModified · 2016-05-16T21:38:00Z

This has been released with NLog 4.3.4 :)

Added WrapLineLayoutRendererWrapper

bf35259

304NotModified added feature has unittests labels Apr 26, 2016

Fixed .NET 3.5 issue, changed implementation to use StringBuilder

f8eb9d3

304NotModified reviewed Apr 26, 2016
View reviewed changes

Removed StringBuilder and added tests

4bc53ac

304NotModified added the work in progress label Apr 28, 2016

Put stringbuilder back, added more tests

ea4c47f

304NotModified reviewed May 1, 2016
View reviewed changes

Log message with InternalLogger when WrapLine has invalid value

c3140ba

mathieu added 2 commits May 2, 2016 22:15

Added tests for other layout declarations

80f9e7d

Added method names in test

4ae28b4

304NotModified added this to the 4.3.4 milestone May 4, 2016

304NotModified removed the work in progress label May 4, 2016

304NotModified merged commit ac8190a into NLog:master May 4, 2016

mathieubrun deleted the wrap-line-layout-renderer branch May 6, 2016 19:30

304NotModified added the XSD change label May 16, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added WrapLineLayoutRendererWrapper #1400

Added WrapLineLayoutRendererWrapper #1400

mathieubrun commented Apr 25, 2016

304NotModified commented Apr 26, 2016

304NotModified commented Apr 26, 2016 •

edited

304NotModified commented Apr 26, 2016

mathieubrun commented Apr 26, 2016

304NotModified commented Apr 26, 2016

mathieubrun commented Apr 26, 2016

304NotModified commented Apr 26, 2016

mathieubrun commented Apr 26, 2016

codecov-io commented Apr 26, 2016 •

edited

304NotModified commented Apr 26, 2016

304NotModified Apr 26, 2016

mathieubrun Apr 27, 2016

304NotModified commented Apr 28, 2016

mathieubrun commented Apr 28, 2016

304NotModified May 1, 2016

304NotModified commented May 1, 2016 •

edited

304NotModified commented May 2, 2016

mathieubrun commented May 2, 2016

304NotModified commented May 2, 2016

mathieubrun commented May 2, 2016

mathieubrun commented May 2, 2016

304NotModified commented May 2, 2016 •

edited

304NotModified commented May 4, 2016

mathieubrun commented May 6, 2016 •

edited

304NotModified commented May 16, 2016

Added WrapLineLayoutRendererWrapper #1400

Added WrapLineLayoutRendererWrapper #1400

Conversation

mathieubrun commented Apr 25, 2016

304NotModified commented Apr 26, 2016

304NotModified commented Apr 26, 2016 • edited

304NotModified commented Apr 26, 2016

mathieubrun commented Apr 26, 2016

304NotModified commented Apr 26, 2016

mathieubrun commented Apr 26, 2016

304NotModified commented Apr 26, 2016

mathieubrun commented Apr 26, 2016

codecov-io commented Apr 26, 2016 • edited

Current coverage is 75.49%

304NotModified commented Apr 26, 2016

304NotModified Apr 26, 2016

Choose a reason for hiding this comment

mathieubrun Apr 27, 2016

Choose a reason for hiding this comment

304NotModified commented Apr 28, 2016

mathieubrun commented Apr 28, 2016

304NotModified May 1, 2016

Choose a reason for hiding this comment

304NotModified commented May 1, 2016 • edited

304NotModified commented May 2, 2016

mathieubrun commented May 2, 2016

304NotModified commented May 2, 2016

mathieubrun commented May 2, 2016

mathieubrun commented May 2, 2016

304NotModified commented May 2, 2016 • edited

304NotModified commented May 4, 2016

mathieubrun commented May 6, 2016 • edited

304NotModified commented May 16, 2016

304NotModified commented Apr 26, 2016 •

edited

codecov-io commented Apr 26, 2016 •

edited

304NotModified commented May 1, 2016 •

edited

304NotModified commented May 2, 2016 •

edited

mathieubrun commented May 6, 2016 •

edited