summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/util/Util.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/util/Util.java')
-rw-r--r--src/main/java/org/openslx/util/Util.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/util/Util.java b/src/main/java/org/openslx/util/Util.java
index 441bc88..8593f80 100644
--- a/src/main/java/org/openslx/util/Util.java
+++ b/src/main/java/org/openslx/util/Util.java
@@ -2,11 +2,12 @@ package org.openslx.util;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class Util
{
- private static Logger log = Logger.getLogger( Util.class );
+ private static Logger log = LogManager.getLogger( Util.class );
/**
* Check if the given object is null, abort program if true. An optional
@@ -117,9 +118,20 @@ public class Util
}
}
+ /**
+ * Number of seconds elapsed since 1970-01-01 UTC.
+ */
public static long unixTime()
{
return System.currentTimeMillis() / 1000;
}
+ /**
+ * Monotonic tick count in milliseconds, not bound to RTC.
+ */
+ public static long tickCount()
+ {
+ return System.nanoTime() / 1000;
+ }
+
}