Server edits, update server CSS

mikera · mikera · commit 28b4acb1d671 · 2024-08-23T10:48:46.000+01:00
diff --git a/convex-cli/src/main/java/convex/cli/Main.java b/convex-cli/src/main/java/convex/cli/Main.java
@@ -128,18 +128,7 @@ public int mainExecute(String[] args) {
 				return ExitCodes.SUCCESS;
 			}
 
-			Level[] verboseLevels = { Level.OFF, Level.WARN, Level.INFO, Level.DEBUG, Level.TRACE, Level.ALL };
-
-			if (verbose == null)
-				verbose = 0;
-			if (verbose >= 0 && verbose < verboseLevels.length) {
-				// Set root logger level?
-				ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-				root.setLevel(verboseLevels[verbose]);
-			} else {
-				informError("ERROR: Invalid verbosity level: " + verbose);
-				return ExitCodes.ERROR;
-			}
+			setupVerbosity();
 
 			int result = commandLine.execute(args);
 			return result;
@@ -150,6 +139,24 @@ public int mainExecute(String[] args) {
 		}
 	}
 
+	private void setupVerbosity() {
+		Level[] verboseLevels = { Level.OFF, Level.WARN, Level.INFO, Level.DEBUG, Level.TRACE, Level.ALL };
+
+		if (verbose == null)
+			verbose = 0;
+		if (verbose >= 0 && verbose < verboseLevels.length) {
+			// Set root logger level?
+			try {
+			ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+			root.setLevel(verboseLevels[verbose]);
+			} catch (Exception e) {
+				informWarning("Failed to set verbosity level: "+e.getMessage());
+			}
+		} else {
+			throw new CLIError(ExitCodes.USAGE,"Invalid verbosity level: " + verbose);
+		}
+	}
+
 	/**
 	 * Version provider class
 	 */
diff --git a/convex-cli/src/main/java/convex/cli/peer/PeerStart.java b/convex-cli/src/main/java/convex/cli/peer/PeerStart.java
@@ -114,9 +114,10 @@ private AKeyPair findPeerKey(EtchStore store) {
 	public void run() {
 		storeMixin.ensureKeyStore();
 		try (EtchStore store = etchMixin.getEtchStore()) {
+			
 			AKeyPair peerKey=findPeerKey(store);
 			if (peerKey==null) {
-				informWarning("No --peer-key specified or inferred from Etch Store.");
+				informWarning("No --peer-key specified or inferred from Etch Store "+store);
 				showUsage();
 				return;
 			}
diff --git a/convex-core/src/main/java/etch/EtchStore.java b/convex-core/src/main/java/etch/EtchStore.java
@@ -249,7 +249,11 @@ protected <T extends ACell> void addToCache(Ref<T> ref) {
 
 	@Override
 	public String toString() {
-		return "EtchStore at: " + getFileName();
+		try {
+			return "EtchStore: " + getFile().getCanonicalPath();
+		} catch (Exception e) {
+			return "EtchStore: <File name lookup failed>";
+		}
 	}
 
 	/**
diff --git a/convex-peer/src/main/java/convex/peer/Server.java b/convex-peer/src/main/java/convex/peer/Server.java
@@ -155,7 +155,7 @@ private Server(HashMap<Keyword, Object> config) throws IOException, TimeoutExcep
 			if (rk==null) rk=peer.getPeerKey();
 			rootKey=rk;
 
-			// Ensure Peer is stored in executor and persisted
+			// Ensure Peer is stored in executor and initially persisted prior to launch
 			executor.setPeer(peer);
 			executor.persistPeerData();
 			
diff --git a/convex-restapi/src/main/resources/public/css/pico.min.css b/convex-restapi/src/main/resources/public/css/pico.min.css
diff --git a/convex-restapi/src/main/resources/public/index.html b/convex-restapi/src/main/resources/public/index.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <html>
+<head>
+<link rel="stylesheet" href="css/pico.min.css">
+</head>
 <body>
 
 <h1>Convex Peer Server</h1>
