Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 (https://www.gitkraken.com/blog/weak-ssh-key-fix). If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

21.10.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 3c263553 authored by Michael Ott's avatar Michael Ott
Browse files

Don't apply local timezone conversion for Unix timestamps

parent 2a345c4b
......@@ -126,11 +126,7 @@ void TimeStamp::guessFromString(std::string timestr, bool localTime)
} else { // us
raw = tmp;
}
if (localTime) {
convertFromLocal();
}
return;
}
/* Not successful - throw exception */
......
......@@ -175,13 +175,14 @@ void DCDBQuery::genOutput(std::list<DCDB::SensorDataStoreReading> &results, quer
std::cout << start->first.name << ",";
/* Print the time stamp */
if (useLocalTime)
ts.convertToLocal();
if (useRawOutput)
if (useRawOutput) {
std::cout << ts.getRaw();
else
} else {
if (useLocalTime) {
ts.convertToLocal();
}
std::cout << ts.getString();
}
int64_t value, result;
/* Print the sensor value */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment