Change logging for invalid account files to off mode.

TheNewEconomy · Oct 31, 2023 · 9b4d26e · 9b4d26e
1 parent 7e63713
commit 9b4d26e
Showing 1 changed file with 39 additions and 33 deletions.
diff --git a/Core/src/net/tnemc/core/io/storage/datables/yaml/YAMLHoldings.java b/Core/src/net/tnemc/core/io/storage/datables/yaml/YAMLHoldings.java
@@ -158,7 +158,7 @@ public Collection<HoldingsEntry> loadAll(StorageConnector<?> connector, @Nullabl
       final File accFile = new File(TNECore.directory(), "accounts/" + identifier + ".yml");
       if(!accFile.exists()) {
 
-        TNECore.log().error("Null account file passed to YAMLAccount.load. Account: " + identifier);
+        TNECore.log().error("Null account file passed to YAMLAccount.load. Account: " + identifier, DebugLevel.OFF);
         return holdings;
       }
 
@@ -168,54 +168,60 @@ public Collection<HoldingsEntry> loadAll(StorageConnector<?> connector, @Nullabl
         yaml = YamlFile.loadConfiguration(accFile);
       } catch(IOException ignore) {
 
-        TNECore.log().error("Issue loading account file. Account: " + identifier);
+        TNECore.log().error("Issue loading account file. Account: " + identifier, DebugLevel.OFF);
       }
 
 
-      //region, currency, amount, type
-      if(yaml != null) {
-
-        //Holdings.Server.Region.Currency.Handler: Balance
-        if(yaml.contains("Holdings")) {
-          final ConfigurationSection main = yaml.getConfigurationSection("Holdings");
-          for(final String server : main.getKeys(false)) {
+      try {
+        //region, currency, amount, type
+        if(yaml != null) {
 
-            if(!main.contains(server)) {
-              continue;
-            }
-            for(final String region : main.getConfigurationSection(server).getKeys(false)) {
+          //Holdings.Server.Region.Currency.Handler: Balance
+          if(yaml.contains("Holdings")) {
+            final ConfigurationSection main = yaml.getConfigurationSection("Holdings");
+            for(final String server : main.getKeys(false)) {
 
-              if(!main.contains(server + "." + region)) {
+              if(! main.contains(server) || ! main.isConfigurationSection(server)) {
                 continue;
               }
-              for(final String currency : main.getConfigurationSection(server + "." + region).getKeys(false)) {
 
-                if(TNECore.eco().currency().findCurrency(currency).isEmpty()) {
-                  EconomyManager.invalidCurrencies().add(currency);
-                }
+              for(final String region : main.getConfigurationSection(server).getKeys(false)) {
 
-                if(!main.contains(server + "." + region + "." + currency)) {
+                if(! main.contains(server + "." + region)) {
                   continue;
                 }
-                for(final String handler : main.getConfigurationSection(server + "." + region + "." + currency).getKeys(false)) {
-
-                  final String amount = yaml.getString("Holdings." + server + "." + region + "." + currency + "." + handler, "0.0");
-
-                  //region, currency, amount, type
-                  final HoldingsEntry entry = new HoldingsEntry(region,
-                                                                UUID.fromString(currency),
-                                                                new BigDecimal(amount),
-                                                                Identifier.fromID(handler)
-                  );
-
-                  TNECore.log().debug("YAMLHoldings-loadAll-Entry ID:" + entry.getHandler(), DebugLevel.DEVELOPER);
-                  TNECore.log().debug("YAMLHoldings-loadAll-Entry AMT:" + entry.getAmount().toPlainString(), DebugLevel.DEVELOPER);
-                  holdings.add(entry);
+                for(final String currency : main.getConfigurationSection(server + "." + region).getKeys(false)) {
+
+                  if(TNECore.eco().currency().findCurrency(currency).isEmpty()) {
+                    EconomyManager.invalidCurrencies().add(currency);
+                  }
+
+                  if(! main.contains(server + "." + region + "." + currency)) {
+                    continue;
+                  }
+                  for(final String handler : main.getConfigurationSection(server + "." + region + "." + currency).getKeys(false)) {
+
+                    final String amount = yaml.getString("Holdings." + server + "." + region + "." + currency + "." + handler, "0.0");
+
+                    //region, currency, amount, type
+                    final HoldingsEntry entry = new HoldingsEntry(region,
+                            UUID.fromString(currency),
+                            new BigDecimal(amount),
+                            Identifier.fromID(handler)
+                    );
+
+                    TNECore.log().debug("YAMLHoldings-loadAll-Entry ID:" + entry.getHandler(), DebugLevel.DEVELOPER);
+                    TNECore.log().debug("YAMLHoldings-loadAll-Entry AMT:" + entry.getAmount().toPlainString(), DebugLevel.DEVELOPER);
+                    holdings.add(entry);
+                  }
                 }
               }
             }
           }
         }
+      } catch(Exception ignore) {
+
+        TNECore.log().error("Issue loading account file. Skipping. Account: " + identifier, DebugLevel.OFF);
       }
       yaml = null;
     }