Skip to content
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

fixed file extension #631

Merged
merged 1 commit into from
Apr 4, 2021
Merged

fixed file extension #631

merged 1 commit into from
Apr 4, 2021

Conversation

xiaobfly
Copy link
Contributor

@xiaobfly xiaobfly commented Apr 1, 2021

google::SetLogFilenameExtension(".log");

before:
Test.log20210401-161508.34056

after:
Test20210401-161508.34056.log

@google-cla
Copy link

google-cla bot commented Apr 1, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no label Apr 1, 2021
@xiaobfly
Copy link
Contributor Author

xiaobfly commented Apr 1, 2021

@googlebot I signed it!

@google-cla
Copy link

google-cla bot commented Apr 1, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@google-cla
Copy link

google-cla bot commented Apr 1, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@xiaobfly xiaobfly closed this Apr 1, 2021
@xiaobfly xiaobfly reopened this Apr 1, 2021
@google-cla
Copy link

google-cla bot commented Apr 1, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@xiaobfly
Copy link
Contributor Author

xiaobfly commented Apr 1, 2021

@googlebot I fix

@google-cla
Copy link

google-cla bot commented Apr 1, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

src/utilities.cc Outdated Show resolved Hide resolved
@xiaobfly xiaobfly requested a review from sergiud April 2, 2021 01:51
@xiaobfly xiaobfly marked this pull request as draft April 2, 2021 02:00
@xiaobfly xiaobfly marked this pull request as ready for review April 2, 2021 02:00
@sergiud sergiud self-assigned this Apr 4, 2021
@sergiud sergiud added this to the 0.5 milestone Apr 4, 2021
@sergiud sergiud merged commit 82320a8 into google:master Apr 4, 2021
@aesophor
Copy link
Contributor

aesophor commented Apr 7, 2021

If the user has set a filename_extension for the log files, then the log cleaner will be broken because the filename format has been changed.

glog/src/logging.cc

Lines 1375 to 1432 in e51790b

bool LogCleaner::IsLogFromCurrentProject(const string& filepath,
const string& base_filename,
const string& filename_extension) const {
// We should remove duplicated delimiters from `base_filename`, e.g.,
// before: "/tmp//<base_filename>.<create_time>.<pid>"
// after: "/tmp/<base_filename>.<create_time>.<pid>"
string cleaned_base_filename;
for (size_t i = 0; i < base_filename.size(); ++i) {
const char& c = base_filename[i];
if (cleaned_base_filename.empty()) {
cleaned_base_filename += c;
} else if (c != dir_delim_ ||
c != cleaned_base_filename.at(cleaned_base_filename.size() - 1)) {
cleaned_base_filename += c;
}
}
// Return early if the filename doesn't start with `cleaned_base_filename`.
if (filepath.find(cleaned_base_filename) != 0) {
return false;
}
// Check if in the string `filename_extension` is right next to
// `cleaned_base_filename` in `filepath` if the user
// has set a custom filename extension.
if (!filename_extension.empty()) {
if (filepath.find(filename_extension) != cleaned_base_filename.size()) {
return false;
}
cleaned_base_filename += filename_extension;
}
// The characters after `cleaned_base_filename` should match the format:
// YYYYMMDD-HHMMSS.pid
for (size_t i = cleaned_base_filename.size(); i < filepath.size(); i++) {
const char& c = filepath[i];
if (i <= cleaned_base_filename.size() + 7) { // 0 ~ 7 : YYYYMMDD
if (c < '0' || c > '9') { return false; }
} else if (i == cleaned_base_filename.size() + 8) { // 8: -
if (c != '-') { return false; }
} else if (i <= cleaned_base_filename.size() + 14) { // 9 ~ 14: HHMMSS
if (c < '0' || c > '9') { return false; }
} else if (i == cleaned_base_filename.size() + 15) { // 15: .
if (c != '.') { return false; }
} else if (i >= cleaned_base_filename.size() + 16) { // 16+: pid
if (c < '0' || c > '9') { return false; }
}
}
return true;
}

@xiaobfly
Copy link
Contributor Author

xiaobfly commented Apr 7, 2021

IsLogFromCurrentProject

I will fix it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants