generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-03 01:54:47 +02:00
Code Issues Projects Releases Wiki Activity

fixed #318: Logger local time doesn't automatically account for DST

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-05-21 09:00:53 +02:00
parent 9d47f3ced8
commit ad9cebaf38
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Foundation/src/Timezone_UNIX.cpp
View File

@ -16,6 +16,7 @@
#include "Poco/Timezone.h" #include "Poco/Timezone.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include "Poco/Mutex.h"
#include <ctime> #include <ctime>
@ -32,6 +33,8 @@ public:
int timeZone() int timeZone()
{ {
Poco::FastMutex::ScopedLock lock(_mutex);
#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || defined(POCO_ANDROID) // no timezone global var #if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || defined(POCO_ANDROID) // no timezone global var
std::time_t now = std::time(NULL); std::time_t now = std::time(NULL);
struct std::tm t; struct std::tm t;
@ -39,16 +42,24 @@ public:
std::time_t utc = std::mktime(&t); std::time_t utc = std::mktime(&t);
return now - utc; return now - utc;
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
tzset();
return -_timezone; return -_timezone;
#else #else
tzset();
return -timezone; return -timezone;
#endif #endif
} }
const char* name(bool dst) const char* name(bool dst)
{ {
Poco::FastMutex::ScopedLock lock(_mutex);
tzset();
return tzname[dst ? 1 : 0]; return tzname[dst ? 1 : 0];
} }
private:
Poco::FastMutex _mutex;
}; };