aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-12-19 19:16:32 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2012-12-19 19:16:32 -0800
commit247c226aef92f728956afd35a8bd0dd3272aacfd (patch)
tree40911cf7d7bc9a5b964dbf0d80c60ed692232adf
parenta506293e4196d480cca8149a7269f1e003ff8f7f (diff)
parentaaa43d4e6c99a9683a0b817a6b1bf461134d2391 (diff)
downloadtraccar-server-247c226aef92f728956afd35a8bd0dd3272aacfd.tar.gz
traccar-server-247c226aef92f728956afd35a8bd0dd3272aacfd.tar.bz2
traccar-server-247c226aef92f728956afd35a8bd0dd3272aacfd.zip
Merge pull request #111 from hallmark9/master
Make log entry timestamp in 24-hour format.
-rw-r--r--src/org/traccar/Server.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index 96d994fbd..3b22e8f2d 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -184,7 +184,7 @@ public class Server {
System.getProperty("line.separator", "\n");
private final DateFormat dateFormat =
- new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public String format(LogRecord record) {
StringBuffer line = new StringBuffer();