Resolve a few warnings and typos

freyacodes · Mar 11, 2018 · 601bfbe · 601bfbe
1 parent 6040564
commit 601bfbe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/FredBoat/src/main/java/fredboat/api/API.java b/FredBoat/src/main/java/fredboat/api/API.java
@@ -105,7 +105,7 @@ public static void start(PlayerRegistry playerRegistry, BotMetrics botMetrics, S
 
     public static void turnOnMetrics(MetricsServletAdapter metricsServlet) {
         if (!Launcher.getBotController().getAppConfig().isRestServerEnabled()) {
-            log.warn("Rest server is not enabled. Skipping Spark ignition!");
+            log.warn("Rest server is not enabled. Metrics will not be scrapable!");
             return;
         }
 

diff --git a/FredBoat/src/main/java/fredboat/config/RepoConfiguration.java b/FredBoat/src/main/java/fredboat/config/RepoConfiguration.java
@@ -90,7 +90,7 @@ public RepoConfiguration(BackendConfig backendConfig, ShutdownHandler shutdownHa
         String ourVersion = Integer.toString(RestRepo.API_VERSION);
         if (supportedApiVersions.contains(ourVersion)
                 || supportedApiVersions.contains("v" + ourVersion)) {
-            log.info("Using Quaterdeck API v{}", ourVersion);
+            log.info("Using Quarterdeck API v{}", ourVersion);
         } else {
             log.error("Quarterdeck API does not support our expected version v{}. Update quarterdeck, or roll back this FredBoat version!", ourVersion);
             shutdownHandler.shutdown(ExitCodes.EXIT_CODE_ERROR);

diff --git a/FredBoat/src/main/java/fredboat/event/MusicPersistenceHandler.java b/FredBoat/src/main/java/fredboat/event/MusicPersistenceHandler.java
@@ -39,6 +39,7 @@
 import fredboat.feature.I18n;
 import fredboat.jda.JdaEntityProvider;
 import fredboat.messaging.CentralMessaging;
+import fredboat.shared.constant.DistributionEnum;
 import fredboat.shared.constant.ExitCodes;
 import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.entities.Guild;
@@ -189,7 +190,7 @@ public void handlePreShutdown(int code) {
     @Override
     public void onReady(ReadyEvent event) {
         //the current implementation of music persistence is not a good idea on big bots
-        if (credentials.getRecommendedShardCount() <= 10) {
+        if (credentials.getRecommendedShardCount() <= 10 && appConfig.getDistribution() != DistributionEnum.MUSIC) {
             try {
                 reloadPlaylists(event.getJDA());
             } catch (Exception e) {

diff --git a/FredBoat/src/main/java/fredboat/util/rest/SpotifyAPIWrapper.java b/FredBoat/src/main/java/fredboat/util/rest/SpotifyAPIWrapper.java
@@ -76,6 +76,9 @@ public SpotifyAPIWrapper(Credentials credentials) {
      * https://developer.spotify.com/web-api/authorization-guide/#client-credentials-flow
      */
     private void refreshAccessToken() {
+        if (credentials.getSpotifyId().isEmpty() || credentials.getSpotifySecret().isEmpty()) {
+            return; //no spotify credentials configured, dont throw unnecessary errors
+        }
         try {
             JSONObject jsonClientCredentials = BotController.HTTP.post(URL_SPOTIFY_AUTHENTICATION_HOST + "/api/token",
                     Http.Params.of(