/*
- * jSite-remote - UpdateChecker.java -
- * Copyright © 2008 David Roden
+ * jSite - UpdateChecker.java - Copyright © 2008–2012 David Roden
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import de.todesbaum.jsite.main.Main;
import de.todesbaum.jsite.main.Version;
*/
public class UpdateChecker implements Runnable {
+ /** The logger. */
+ private static final Logger logger = Logger.getLogger(UpdateChecker.class.getName());
+
/** Counter for connection names. */
private static int counter = 0;
/** The edition for the update check URL. */
- private static final int UPDATE_EDITION = 0;
+ private static final int UPDATE_EDITION = 11;
/** The URL for update checks. */
private static final String UPDATE_KEY = "USK@e3myoFyp5avg6WYN16ImHri6J7Nj8980Fm~aQe4EX1U,QvbWT0ImE0TwLODTl7EoJx2NBnwDxTbLTE6zkB-eGPs,AQACAAE";
int currentEdition = lastUpdateEdition;
while (!shouldStop()) {
checkNow = false;
- System.out.println("Trying " + constructUpdateKey(currentEdition));
+ logger.log(Level.FINE, "Trying " + constructUpdateKey(currentEdition));
ClientGet clientGet = new ClientGet("get-update-key");
clientGet.setUri(constructUpdateKey(currentEdition));
clientGet.setPersistence(Persistence.CONNECTION);
boolean stop = false;
while (!stop) {
Message message = client.readMessage();
- System.out.println(message);
+ logger.log(Level.FINEST, "Received message: " + message);
+ if (message == null) {
+ break;
+ }
if ("GetFailed".equals(message.getName())) {
if ("27".equals(message.get("code"))) {
String editionString = message.get("redirecturi").split("/")[2];
/* ignore. */
}
if (editionNumber != -1) {
- System.out.println("Found new edition " + editionNumber);
+ logger.log(Level.INFO, "Found new edition " + editionNumber);
currentEdition = editionNumber;
lastUpdateEdition = editionNumber;
checkNow = true;
}
}
if ("AllData".equals(message.getName())) {
- System.out.println("Update data found.");
+ logger.log(Level.FINE, "Update data found.");
InputStream dataInputStream = null;
Properties properties = new Properties();
try {
if (foundVersion != null) {
lastVersion = foundVersion;
String versionTimestampString = properties.getProperty("jSite.Date");
- System.out.println(versionTimestampString);
+ logger.log(Level.FINEST, "Version timestamp: " + versionTimestampString);
long versionTimestamp = -1;
try {
versionTimestamp = Long.parseLong(versionTimestampString);
}
}
} catch (IOException e) {
- System.out.println("Got IOException: " + e.getMessage());
+ logger.log(Level.INFO, "Got IOException: " + e.getMessage());
e.printStackTrace();
}
if (!checkNow && !shouldStop()) {