Added expiration of documents #2
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
snakefoot
reviewed
Sep 26, 2022
src/NLog.Raven/RavenTarget.cs
Outdated
| if (ExpirationOffsetInDays > 0) | ||
| { | ||
| var expiry = DateTime.UtcNow.AddDays(ExpirationOffsetInDays); | ||
| bulkInsert.Store(logEntry, new MetadataAsDictionary |
There was a problem hiding this comment.
Could one make a single MetadataAsDictionary-instance (outside the loop), and use the same instance for all logEntries?
There was a problem hiding this comment.
Now using one instance for all entries.
snakefoot
reviewed
Sep 26, 2022
src/NLog.Raven/RavenTarget.cs
Outdated
| var expiry = DateTime.UtcNow.AddDays(ExpirationOffsetInDays); | ||
| bulkInsert.Store(logEntry, new MetadataAsDictionary | ||
| { | ||
| new KeyValuePair<string, object>("@expires", expiry) |
There was a problem hiding this comment.
Why not use Constants.Documents.Metadata.Expires instead of "@expires" ?
There was a problem hiding this comment.
Changed to available constant.
snakefoot
reviewed
Sep 26, 2022
src/NLog.Raven/RavenTarget.cs
Outdated
| /// <summary> | ||
| /// Expiration date of document | ||
| /// </summary> | ||
| public int ExpirationOffsetInDays { get; set; } |
There was a problem hiding this comment.
Maybe rename to ExpiryDays ? (Easier to spell) Or TimeToLiveDays ?
snakefoot
reviewed
Jan 23, 2023
src/NLog.Raven.Tests/App.config
Outdated
| @@ -9,7 +9,7 @@ | |||
| </extensions> | |||
| <targets> | |||
| <target name="raven" xsi:type="BufferingWrapper" flushTimeout="7000"> | |||
| <target xsi:type="Raven" IdType="Guid" CollectionName="LogEntries" Urls="http://ws-1:8080;Database=RavenNLog"> | |||
| <target xsi:type="Raven" IdType="Guid" CollectionName="LogEntriesExpire" Urls="http://localhost:8080" Database="logs" ExpirationOffsetInDays="3"> | |||
There was a problem hiding this comment.
Rename from ExpirationOffsetInDays to new ExpiryDays
snakefoot
reviewed
Jan 23, 2023
src/NLog.Raven/RavenTarget.cs
Outdated
| @@ -122,11 +128,24 @@ protected override void Write(IList<AsyncLogEventInfo> logEvents) | |||
| { | |||
| using (var bulkInsert = _documentStore.BulkInsert()) | |||
| { | |||
| for (int i = 0; i < logEvents.Count; ++i) | |||
| var expiry = DateTime.UtcNow.AddDays(ExpiryDays); | |||
There was a problem hiding this comment.
Consider doing this:
var expiryMetaData = ExpiryDays > 0 ? new MetadataAsDictionary
{
new KeyValuePair<string, object>(Constants.Documents.Metadata.Expires, DateTime.UtcNow.AddDays(ExpiryDays))
} : null;
snakefoot
reviewed
Jan 23, 2023
src/NLog.Raven/RavenTarget.cs
Outdated
| var logEntry = CreateLogEntry(logEvent); | ||
| bulkInsert.Store(logEntry); | ||
| if (ExpiryDays > 0) |
There was a problem hiding this comment.
Then use it like this:
if (expiryMetaData != null
{
bulkInsert.Store(logEntry, expirationMetadata);
}
else
{
bulkInsert.Store(logEntry);
}
snakefoot
approved these changes
Jan 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.