-
Notifications
You must be signed in to change notification settings - Fork 275
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[logfile]: Add handling of Sairedis rec filename #747
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -97,6 +97,58 @@ bool Recorder::setRecordingOutputDirectory( | |
return true; | ||
} | ||
|
||
bool Recorder::setRecordingFilename( | ||
_In_ const sai_attribute_t &attr) | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
if (attr.value.s8list.count == 0) | ||
{ | ||
m_recordingFileName = "sairedis.rec"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this name is also used in constructor, can you make a define on top of file and reuse define here ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. address the commit in the latest commit |
||
|
||
SWSS_LOG_NOTICE("setting recording filename to default filename: %s", m_recordingFileName.c_str()); | ||
|
||
requestLogRotate(); | ||
|
||
return true; | ||
} | ||
|
||
if (attr.value.s8list.list == NULL) | ||
{ | ||
SWSS_LOG_ERROR("list pointer is NULL"); | ||
|
||
return false; | ||
} | ||
|
||
size_t len = strnlen((const char *)attr.value.s8list.list, attr.value.s8list.count); | ||
|
||
if (len != (size_t)attr.value.s8list.count) | ||
{ | ||
SWSS_LOG_ERROR("count (%u) is different than strnlen (%zu)", attr.value.s8list.count, len); | ||
|
||
return false; | ||
} | ||
|
||
std::string filename((const char*)attr.value.s8list.list, len); | ||
|
||
/// Stop the recording with old file before updating the filename | ||
if (m_enabled) | ||
{ | ||
stopRecording(); | ||
} | ||
|
||
m_recordingFileName = filename; | ||
|
||
SWSS_LOG_NOTICE("setting recording filename : %s", m_recordingFileName.c_str()); | ||
|
||
/// Start recording with new file | ||
if (m_enabled) | ||
{ | ||
startRecording(); | ||
} | ||
return true; | ||
} | ||
|
||
void Recorder::enableRecording( | ||
_In_ bool enabled) | ||
{ | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you could make this @default "sairedis.rec"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
address the commit in the latest commit