diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 744fea3..173dc02 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -124,7 +124,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.13\lib\net45\NLog.dll + ..\packages\NLog.4.5.0\lib\net45\NLog.dll ..\packages\StackExchange.Redis.1.2.6\lib\net46\StackExchange.Redis.dll @@ -140,6 +140,9 @@ + + + @@ -334,13 +337,11 @@ - - - Always - + Designer + Designer diff --git a/CMS_SC/NLog.xsd b/CMS_SC/NLog.xsd index 6b26042..1bd61d8 100644 --- a/CMS_SC/NLog.xsd +++ b/CMS_SC/NLog.xsd @@ -70,6 +70,11 @@ Use InvariantCulture as default culture instead of CurrentCulture. Default value is: false. + + + Perform mesage template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty. + + @@ -164,6 +169,7 @@ + @@ -325,16 +331,11 @@ - + - - - Name of the target. - - Delay the flush until the LogEvent has been confirmed as written @@ -345,6 +346,11 @@ Condition expression. Log events who meet this condition will cause a flush on the wrapped target. + + + Name of the target. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -360,6 +366,7 @@ + @@ -378,6 +385,11 @@ Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. + + + Action to take if the buffer overflows. + + Indicates whether to use sliding timeout. @@ -391,6 +403,12 @@ + + + + + + @@ -402,21 +420,25 @@ - + - + - - + + + + + + + - - + @@ -454,9 +476,9 @@ Action that should be taken if the will be more connections than . - + - Action that should be taken if the message is larger than maxMessageSize. + Maximum queue size. @@ -479,14 +501,24 @@ Network address. - + - Maximum queue size. + Action that should be taken if the message is larger than maxMessageSize. - + - Indicates whether to include stack contents. + NDLC item separator. + + + + + NDC item separator. + + + + + Indicates whether to include NLog-specific extensions to log4j schema. @@ -494,9 +526,19 @@ Indicates whether to include source info (file name and line number) in the information sent over the network. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include contents of the stack. + + + + + Indicates whether to include stack contents. + + + + + Indicates whether to include dictionary contents. @@ -509,19 +551,19 @@ Indicates whether to include call site (class and method name) in the information sent over the network. + + + Option to include all properties from the log events + + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. - - - - - Indicates whether to include dictionary contents. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -570,12 +612,12 @@ - - - + + + @@ -598,11 +640,6 @@ Footer. - - - Indicates whether to use default row highlighting rules. - - Indicates whether to auto-check if the console is available. - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App) @@ -618,6 +655,11 @@ Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). + + + Indicates whether to use default row highlighting rules. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -671,14 +713,19 @@ + - + + + Compile the ? This can improve the performance, but at the costs of more memory usage. If false, the Regex Cache is used. + + Indicates whether to ignore case when comparing texts. @@ -699,11 +746,6 @@ Indicates whether to match whole words only. - - - Compile the ? This can improve the performance, but at the costs of more memory usage. If false, the Regex Cache is used. - - Background color. @@ -723,9 +765,9 @@ - + @@ -748,11 +790,6 @@ Footer. - - - Indicates whether to send the log messages to the standard error instead of the standard output. - - Indicates whether to auto-check if the console is available - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App) @@ -763,6 +800,11 @@ The encoding for writing messages to the . + + + Indicates whether to send the log messages to the standard error instead of the standard output. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1007,14 +1049,14 @@ + - - - + + @@ -1032,6 +1074,11 @@ Layout that renders event Category. + + + Optional entrytype. When not set, or when not convertable to then determined by + + Layout that renders event ID. @@ -1047,21 +1094,6 @@ Name of the machine on which Event Log service is running. - - - Value to be used as the event Source. - - - - - Action to take if the message is larger than the option. - - - - - Optional entrytype. When not set, or when not convertable to then determined by - - Maximum Event log size in kilobytes. If null, the value won't be set. Default is 512 Kilobytes as specified by Eventlog API @@ -1072,6 +1104,16 @@ Message length limit to write to the Event Log. + + + Value to be used as the event Source. + + + + + Action to take if the message is larger than the option. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1123,38 +1165,39 @@ + + - - - - - - - + + - - + + + + + + - - + + - + @@ -1186,6 +1229,11 @@ Line ending mode. + + + Indicates whether to compress archive files into the zip archive format. + + Way file archives are numbered. @@ -1196,6 +1244,11 @@ Name of the file to be used for an archive. + + + Is the an absolute or relative path? + + Indicates whether to automatically archive log files every time the specified time passes. @@ -1206,51 +1259,21 @@ Size in bytes above which log files will be automatically archived. Warning: combining this with isn't supported. We cannot create multiple archive files, if they should have the same name. Choose: - - - Indicates whether to compress archive files into the zip archive format. - - Maximum number of archive files that should be kept. - - - Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation. - - - - - Is the an absolute or relative path? - - - - - Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong. - - - - - Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write - - - - - Is the an absolute or relative path? - - - - - Value indicationg whether file creation calls should be synchronized by a system global mutex. - - Indicates whether the footer should be written only when the file is archived. + + + Maximum number of log filenames that should be stored as existing. + + Name of the file to write to. @@ -1266,44 +1289,69 @@ Indicates whether to archive old log file on startup. + + + Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong. + + Indicates whether to create directories if they do not exist. - - - Indicates whether to enable log file(s) to be deleted. - - - - - File attributes (Windows only). - - Indicates whether to delete old log file on startup. + + + File attributes (Windows only). + + + + + Indicates whether to write BOM (byte order mark) in created files + + + + + Indicates whether to enable log file(s) to be deleted. + + Indicates whether to replace file contents on each write instead of appending log message at the end. + + + Value indicationg whether file creation calls should be synchronized by a system global mutex. + + + + + Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation. + + + + + Is the an absolute or relative path? + + Indicates whether concurrent writes to the log file by multiple processes on the same host. - + - Indicates whether to keep log file open instead of opening and closing it on each logging event. + Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write - + - Maximum number of log filenames that should be stored as existing. + Delay in milliseconds to wait before attempting to write to the file again. @@ -1336,16 +1384,16 @@ Indicates whether to automatically flush the file buffers after each log message. - - - Delay in milliseconds to wait before attempting to write to the file again. - - Number of times the write is appended on the file before NLog discards the log message. + + + Indicates whether to keep log file open instead of opening and closing it on each logging event. + + @@ -1357,6 +1405,13 @@ + + + + + + + @@ -1374,13 +1429,6 @@ - - - - - - - @@ -1516,16 +1564,11 @@ - + - - - Name of the target. - - Interval in which messages will be written up to the number of messages. @@ -1536,6 +1579,11 @@ Maximum allowed number of messages written per . + + + Name of the target. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1637,19 +1685,19 @@ - + + - - - + + + + - - - - + + @@ -1680,9 +1728,14 @@ Footer. - + - Indicates whether to send message as HTML instead of plain text. + Indicates whether NewLine characters in the body should be replaced with tags. + + + + + Priority used for sending mails. @@ -1690,9 +1743,9 @@ Encoding to be used for sending e-mail. - + - Indicates whether to add new lines between log entries. + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). @@ -1700,14 +1753,19 @@ CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + Indicates whether to add new lines between log entries. - + - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + Indicates whether to send message as HTML instead of plain text. + + + + + Sender's email address (e.g. joe@domain.com). @@ -1720,24 +1778,9 @@ Mail subject. - + - Sender's email address (e.g. joe@domain.com). - - - - - Indicates the SMTP client timeout. - - - - - Priority used for sending mails. - - - - - Indicates whether NewLine characters in the body should be replaced with tags. + Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). @@ -1745,6 +1788,11 @@ Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit + + + Indicates the SMTP client timeout. + + SMTP Server to be used for sending. @@ -1833,74 +1881,6 @@ - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Encoding to be used when writing text to the queue. - - - - - Indicates whether to use the XML format when serializing message. This will also disable creating queues. - - - - - Indicates whether to check if a queue exists before writing to it. - - - - - Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit - - - - - Indicates whether to create the queue if it doesn't exists. - - - - - Label to associate with each message. - - - - - Name of the queue to write to. - - - - - Indicates whether to use recoverable messages (with guaranteed delivery). - - - - - @@ -1944,13 +1924,13 @@ - - + + @@ -1983,16 +1963,6 @@ Indicates whether to append newline at the end of log message. - - - Action that should be taken if the will be more connections than . - - - - - Action that should be taken if the message is larger than maxMessageSize. - - Network address. @@ -2018,6 +1988,16 @@ Maximum queue size. + + + Action that should be taken if the will be more connections than . + + + + + Action that should be taken if the message is larger than maxMessageSize. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -2037,21 +2017,25 @@ - + - + - - + + + + + + + - - + @@ -2089,9 +2073,9 @@ Action that should be taken if the will be more connections than . - + - Action that should be taken if the message is larger than maxMessageSize. + Maximum queue size. @@ -2114,14 +2098,24 @@ Network address. - + - Maximum queue size. + Action that should be taken if the message is larger than maxMessageSize. - + - Indicates whether to include stack contents. + NDLC item separator. + + + + + NDC item separator. + + + + + Indicates whether to include NLog-specific extensions to log4j schema. @@ -2129,9 +2123,19 @@ Indicates whether to include source info (file name and line number) in the information sent over the network. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include contents of the stack. + + + + + Indicates whether to include stack contents. + + + + + Indicates whether to include dictionary contents. @@ -2144,19 +2148,19 @@ Indicates whether to include call site (class and method name) in the information sent over the network. + + + Option to include all properties from the log events + + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. - - - - - Indicates whether to include dictionary contents. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -2486,6 +2490,7 @@ + @@ -2498,6 +2503,11 @@ Layout used to format log messages. + + + Always use independent of + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -2511,47 +2521,36 @@ - - - - + + + + + + + + Name of the target. - - - Should we include the BOM (Byte-order-mark) for UTF? Influences the property. This will only work for UTF-8. - - Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit - + - Encoding. - - - - - Value whether escaping be done according to the old NLog style (Very non-standard) - - - - - Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs) + Should we include the BOM (Byte-order-mark) for UTF? Influences the property. This will only work for UTF-8. @@ -2569,11 +2568,36 @@ Protocol to be used when calling web service. + + + Custom proxy address, include port separated by a colon + + + + + Encoding. + + Web service URL. + + + Value whether escaping be done according to the old NLog style (Very non-standard) + + + + + Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs) + + + + + Indicates whether to pre-authenticate the HttpWebRequest (Requires 'Authorization' in parameters) + + Name of the root XML element, if POST of XML document chosen. If so, this property must not be null. (see and ). @@ -2584,6 +2608,11 @@ (optional) root namespace of the XML document, if POST of XML document chosen. (see and ). + + + Proxy configuration when calling web service + + @@ -2597,6 +2626,14 @@ + + + + + + + + @@ -2708,9 +2745,10 @@ + - + @@ -2719,7 +2757,7 @@ - Option to include all properties from the log events + Option to include all properties from the log event (as JSON) @@ -2727,6 +2765,11 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the dictionary. + + Option to render the empty object value {} @@ -2737,9 +2780,9 @@ Option to suppress the extra spaces in the output json - + - Indicates whether to include contents of the dictionary. + How far should the JSON serializer follow object references before backing off @@ -2747,11 +2790,22 @@ - - + + + + + + Layout that will be rendered as the attribute's value. + + + + + Name of the attribute. + + Determines wether or not this attribute will be Json encoded. @@ -2762,14 +2816,9 @@ Indicates whether to escape non-ascii characters - + - Layout that will be rendered as the attribute's value. - - - - - Name of the attribute. + Whether an attribute with empty value should be included in the output @@ -2806,6 +2855,8 @@ + + @@ -2822,6 +2873,16 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the stack. + + + + + Indicates whether to include contents of the stack. + + @@ -2996,6 +3057,80 @@ + + + + + + + + + + + + + + + + + + + Action to be taken when filter matches. + + + + + Default number of unique filter values to expect, will automatically increase if needed + + + + + Applies the configured action to the initial logevent that starts the timeout period. Used to configure that it should ignore all events until timeout. + + + + + Layout to be used to filter log messages. + + + + + Max number of unique filter values to expect simultaneously + + + + + Max length of filter values, will truncate if above limit + + + + + How long before a filter expires, and logging is accepted again + + + + + Default buffer size for the internal buffers + + + + + Reuse internal buffers, and doesn't have to constantly allocate new buffers + + + + + Append FilterCount to the when an event is no longer filtered + + + + + Insert FilterCount value into when an event is no longer filtered + + + + + diff --git a/CMS_SC/bin/NLog.dll b/CMS_SC/bin/NLog.dll index 70078fe..c045512 100644 Binary files a/CMS_SC/bin/NLog.dll and b/CMS_SC/bin/NLog.dll differ diff --git a/CMS_SC/packages.config b/CMS_SC/packages.config index 245da0f..8753283 100644 --- a/CMS_SC/packages.config +++ b/CMS_SC/packages.config @@ -30,9 +30,9 @@ - - - + + +