Merge pull request #31 from wireapp/staging

Disable swagger
wireapp · Nov 23, 2022 · 9eb3905 · 9eb3905
2 parents be43c3b + 24f0b45
commit 9eb3905
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/com/wire/bots/recording/MessageHandler.java b/src/main/java/com/wire/bots/recording/MessageHandler.java
@@ -74,6 +74,9 @@ void warmup(ClientRepo repo) {
                         File file = eventProcessor.saveHtml(client, events, filename, false);
                         Logger.debug("warmed up: %s", file.getName());
                         Thread.sleep(2 * 1000);
+                    } catch (IOException e) {
+                        Logger.warning("warmup: %s %s.. removing the bot", convId, e);
+                        channelsDAO.delete(convId);
                     }
                 }
             } catch (Exception e) {

diff --git a/src/main/java/com/wire/bots/recording/Service.java b/src/main/java/com/wire/bots/recording/Service.java
@@ -26,8 +26,12 @@
 import com.wire.xenon.MessageHandlerBase;
 import io.dropwizard.Application;
 import io.dropwizard.assets.AssetsBundle;
+import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
+import io.dropwizard.configuration.SubstitutingSourceProvider;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import io.federecio.dropwizard.swagger.SwaggerBundle;
+import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
 
 import java.util.concurrent.ExecutorService;
 
@@ -43,9 +47,11 @@ public static void main(String[] args) throws Exception {
 
     @Override
     public void initialize(Bootstrap<Config> bootstrap) {
-        super.initialize(bootstrap);
         String workingDir = System.getProperty("user.dir");
 
+        bootstrap.setConfigurationSourceProvider(
+                new SubstitutingSourceProvider(bootstrap.getConfigurationSourceProvider(),
+                new EnvironmentVariableSubstitutor(false)));
         bootstrap.addBundle(new AssetsBundle("/scripts", "/scripts", "index.htm", "scripts"));
         bootstrap.addBundle(new ImagesBundle(workingDir + "/avatars", "/avatars", "avatars"));
         bootstrap.addBundle(new ImagesBundle(workingDir + "/html", "/channel", "channels"));

diff --git a/src/main/java/com/wire/bots/recording/utils/Collector.java b/src/main/java/com/wire/bots/recording/utils/Collector.java
@@ -126,7 +126,8 @@ public void add(RemoteMessage event) throws Exception {
     }
 
     public void add(OriginMessage message) throws ParseException {
-        addSystem(message.getName(), message.getTime(), "file-preview", message.getMessageId());
+        String text = String.format("%s | %s", message.getName(), message.getMimeType());
+        addSystem(text, message.getTime(), "file-preview", message.getMessageId());
     }
 
     public void add(RemoteMessage event, VideoPreviewMessage preview) throws Exception {