import net.pterodactylus.fcp.highlevel.HighLevelClient;
import net.pterodactylus.fcp.highlevel.HighLevelClientListener;
+import net.pterodactylus.fcp.highlevel.HighLevelException;
import net.pterodactylus.fcp.highlevel.KeyGenerationResult;
+import net.pterodactylus.jsite.util.IdGenerator;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.number.Hex;
/**
* TODO
*
* @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
*/
public class NodeManager implements Iterable<Node>, PropertyChangeListener, HighLevelClientListener {
/** All nodes. */
private List<Node> nodes = Collections.synchronizedList(new ArrayList<Node>());
+ /** Map from node ID to node. */
+ private Map<String, Node> idNodes = Collections.synchronizedMap(new HashMap<String, Node>());
+
/** All FCP connections. */
private Map<Node, HighLevelClient> nodeClients = Collections.synchronizedMap(new HashMap<Node, HighLevelClient>());
* The node that was added.
*/
private void fireNodeAdded(Node node) {
- for (NodeListener nodeListener: nodeListeners) {
+ logger.log(Level.FINEST, "firing nodeAdded event with [node=" + node + "]");
+ for (NodeListener nodeListener : nodeListeners) {
nodeListener.nodeAdded(node);
}
}
* The node that was removed
*/
private void fireNodeRemoved(Node node) {
- for (NodeListener nodeListener: nodeListeners) {
+ logger.log(Level.FINEST, "firing nodeRemoved event with [node=" + node + "]");
+ for (NodeListener nodeListener : nodeListeners) {
nodeListener.nodeRemoved(node);
}
}
* The node that is now connected
*/
private void fireNodeConnected(Node node) {
- for (NodeListener nodeListener: nodeListeners) {
+ logger.log(Level.FINEST, "firing nodeConnected event with [node=" + node + "]");
+ for (NodeListener nodeListener : nodeListeners) {
nodeListener.nodeConnected(node);
}
}
* The cause of the failure
*/
private void fireNodeConnectionFailed(Node node, Throwable cause) {
- for (NodeListener nodeListener: nodeListeners) {
+ logger.log(Level.FINEST, "firing nodeConnectionFailed event with [node=" + node + ",cause=" + cause + "]");
+ for (NodeListener nodeListener : nodeListeners) {
nodeListener.nodeConnectionFailed(node, cause);
}
}
* if there was no exception
*/
private void fireNodeDisconnected(Node node, Throwable throwable) {
- for (NodeListener nodeListener: nodeListeners) {
+ logger.log(Level.FINEST, "firing nodeDisconnected event with [node=" + node + ",throwable=" + throwable + "]");
+ for (NodeListener nodeListener : nodeListeners) {
nodeListener.nodeDisconnected(node, throwable);
}
}
* if an I/O error occurs loading the nodes
*/
public void load() throws IOException {
+ logger.log(Level.FINEST, "load()");
File directoryFile = new File(directory);
File nodeFile = new File(directoryFile, "nodes.properties");
if (!nodeFile.exists() || !nodeFile.isFile() || !nodeFile.canRead()) {
List<Node> loadedNodes = new ArrayList<Node>();
while (nodeProperties.containsKey("nodes." + ++nodeIndex + ".name")) {
String nodePrefix = "nodes." + nodeIndex;
+ String nodeId = nodeProperties.getProperty(nodePrefix + ".id");
+ if (nodeId == null) {
+ nodeId = Hex.toHex(IdGenerator.generateId());
+ }
String nodeName = nodeProperties.getProperty(nodePrefix + ".name");
if (!Verifier.verifyNodeName(nodeName)) {
logger.log(Level.WARNING, "invalid node name “" + nodeName + "”, skipping…");
continue;
}
Node newNode = new Node();
+ newNode.setId(nodeId);
newNode.setName(nodeName);
newNode.setHostname(nodeHostname);
newNode.setPort(nodePort);
loadedNodes.add(newNode);
}
- logger.fine("loaded " + loadedNodes.size() + " nodes from config");
+ logger.log(Level.FINE, "loaded " + loadedNodes.size() + " nodes from config");
synchronized (syncObject) {
nodes.clear();
- for (Node node: loadedNodes) {
+ for (Node node : loadedNodes) {
addNode(node);
}
}
* if an I/O error occurs saving the nodes
*/
public void save() throws IOException {
+ logger.log(Level.FINEST, "save()");
File directoryFile = new File(directory);
if (!directoryFile.exists()) {
if (!directoryFile.mkdirs()) {
}
Properties nodeProperties = new Properties();
int nodeIndex = -1;
- for (Node node: nodes) {
+ for (Node node : nodes) {
String nodePrefix = "nodes." + ++nodeIndex;
+ nodeProperties.setProperty(nodePrefix + ".id", node.getId());
nodeProperties.setProperty(nodePrefix + ".name", node.getName());
nodeProperties.setProperty(nodePrefix + ".hostname", node.getHostname());
nodeProperties.setProperty(nodePrefix + ".port", String.valueOf(node.getPort()));
* if the node was not added because it was already known
*/
public boolean addNode(Node node) {
+ logger.log(Level.FINEST, "addNode(node=" + node + ")");
if (nodes.contains(node)) {
- logger.warning("was told to add already known node: " + node);
+ logger.log(Level.WARNING, "was told to add already known node: " + node);
return false;
}
node.addPropertyChangeListener(this);
HighLevelClient highLevelClient = new HighLevelClient(clientName);
nodes.add(node);
+ idNodes.put(node.getId(), node);
clientNodes.put(highLevelClient, node);
nodeClients.put(node, highLevelClient);
highLevelClient.addHighLevelClientListener(this);
* The node to remove
*/
public void removeNode(Node node) {
+ logger.log(Level.FINEST, "removeNode(node=" + node + ")");
synchronized (syncObject) {
if (!nodes.contains(node)) {
return;
if (nodeClients.containsKey(node)) {
disconnect(node);
}
+ nodes.remove(node);
+ idNodes.remove(node.getId());
node.removePropertyChangeListener(this);
fireNodeRemoved(node);
}
* The node to connect to
*/
public void connect(Node node) {
+ logger.log(Level.FINEST, "connect(node=" + node + ")");
HighLevelClient highLevelClient;
highLevelClient = nodeClients.get(node);
if (highLevelClient == null) {
- logger.warning("was told to connect to unknown node: " + node);
+ logger.log(Level.WARNING, "was told to connect to unknown node: " + node);
return;
}
try {
* The node to disconnect
*/
public void disconnect(Node node) {
+ logger.log(Level.FINEST, "disconnect(node=" + node + ")");
synchronized (syncObject) {
if (!nodes.contains(node)) {
return;
}
/**
+ * Returns the node identified by the given ID.
+ *
+ * @param id
+ * The ID of the node
+ * @return The node with the given ID, or <code>null</code> if no such
+ * node was found
+ */
+ Node getNode(String id) {
+ return idNodes.get(id);
+ }
+
+ /**
* Generates a new SSK key pair.
*
* @return An array with the private key at index <code>0</code> and the
* public key at index <code>1</code>
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws JSiteException
+ * if there is a problem with the node
*/
- public String[] generateKeyPair() throws IOException {
- if (!nodes.isEmpty()) {
- Node node = nodes.get(0);
- HighLevelClient highLevelClient = nodeClients.get(node);
- try {
- KeyGenerationResult keyGenerationResult = highLevelClient.generateKey().getResult();
- return new String[] { keyGenerationResult.getInsertURI(), keyGenerationResult.getRequestURI() };
- } catch (InterruptedException e) {
- /* ignore. */
- }
+ public String[] generateKeyPair() throws IOException, JSiteException {
+ logger.log(Level.FINEST, "generateKeyPair()");
+ if (nodes.isEmpty()) {
+ throw new NoNodeException("no node configured");
+ }
+ Node node = nodes.get(0);
+ HighLevelClient highLevelClient = nodeClients.get(node);
+ try {
+ KeyGenerationResult keyGenerationResult = highLevelClient.generateKey().getResult();
+ return new String[] { keyGenerationResult.getInsertURI(), keyGenerationResult.getRequestURI() };
+ } catch (HighLevelException hle1) {
+ throw new BackendException(hle1);
+ } catch (InterruptedException e) {
+ /* ignore. */
}
return null;
}
* {@inheritDoc}
*/
public void clientConnected(HighLevelClient highLevelClient) {
- logger.log(Level.FINER, "clientConnected(c=" + highLevelClient + ")");
+ logger.log(Level.FINEST, "clientConnected(highLevelClient=" + highLevelClient + ")");
Node node = clientNodes.get(highLevelClient);
if (node == null) {
logger.log(Level.WARNING, "got event for unknown client");
* {@inheritDoc}
*/
public void clientDisconnected(HighLevelClient highLevelClient, Throwable throwable) {
- logger.log(Level.FINER, "clientDisconnected(c=" + highLevelClient + ",t=" + throwable + ")");
+ logger.log(Level.FINEST, "clientDisconnected(highLevelClient=" + highLevelClient + ",throwable=" + throwable + ")");
synchronized (syncObject) {
Node node = clientNodes.get(highLevelClient);
if (node == null) {
projects / jSite2.git / blobdiff