projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.8.3'
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
0ce144a
..
c391582
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-77,6
+77,9
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
+ /** The start time. */
+ private final long startupTime = System.currentTimeMillis();
+
/** The options. */
private final Options options = new Options();
/** The options. */
private final Options options = new Options();
@@
-228,6
+231,15
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
//
/**
//
/**
+ * Returns the time Sone was started.
+ *
+ * @return The startup time (in milliseconds since Jan 1, 1970 UTC)
+ */
+ public long getStartupTime() {
+ return startupTime;
+ }
+
+ /**
* Sets the configuration to use. This will automatically save the current
* configuration to the given configuration.
*
* Sets the configuration to use. This will automatically save the current
* configuration to the given configuration.
*
@@
-2350,12
+2362,12
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
* The URI to derive the Sone URI from
* @return The derived URI
*/
* The URI to derive the Sone URI from
* @return The derived URI
*/
- private FreenetURI getSoneUri(String uriString) {
+ private
static
FreenetURI getSoneUri(String uriString) {
try {
FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
return uri;
} catch (MalformedURLException mue1) {
try {
FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
return uri;
} catch (MalformedURLException mue1) {
- logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString
, mue1)
);
+ logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString
), mue1
);
return null;
}
}
return null;
}
}