Selaa lähdekoodia

Log Less (#3685)

Gemini (and others) got hit pretty bad in the last few plaintext benchmarks on Citrine, and we suspect that it was due to removing the resin.xml which configured logging.
Mike Smith 7 vuotta sitten
vanhempi
commit
794a43a38d
28 muutettua tiedostoa jossa 198 lisäystä ja 3 poistoa
  1. 1 0
      frameworks/Clojure/compojure/compojure-raw.dockerfile
  2. 1 0
      frameworks/Clojure/compojure/compojure.dockerfile
  3. 18 0
      frameworks/Clojure/compojure/resin.xml
  4. 1 0
      frameworks/Groovy/grails/grails.dockerfile
  5. 18 0
      frameworks/Groovy/grails/resin.xml
  6. 1 0
      frameworks/Java/activeweb/activeweb-jackson.dockerfile
  7. 1 0
      frameworks/Java/activeweb/activeweb.dockerfile
  8. 18 0
      frameworks/Java/activeweb/resin.xml
  9. 1 0
      frameworks/Java/curacao/curacao.dockerfile
  10. 18 0
      frameworks/Java/curacao/resin.xml
  11. 1 1
      frameworks/Java/gemini/gemini-mysql.dockerfile
  12. 1 1
      frameworks/Java/gemini/gemini-postgres.dockerfile
  13. 1 1
      frameworks/Java/gemini/gemini.dockerfile
  14. 18 0
      frameworks/Java/gemini/resin.xml
  15. 18 0
      frameworks/Java/revenj-jvm/resin.xml
  16. 1 0
      frameworks/Java/revenj-jvm/revenj-jvm.dockerfile
  17. 18 0
      frameworks/Java/servlet/resin.xml
  18. 1 0
      frameworks/Java/servlet/servlet-afterburner.dockerfile
  19. 1 0
      frameworks/Java/servlet/servlet-cjs.dockerfile
  20. 1 0
      frameworks/Java/servlet/servlet-mysql.dockerfile
  21. 1 0
      frameworks/Java/servlet/servlet-postgresql.dockerfile
  22. 1 0
      frameworks/Java/servlet/servlet.dockerfile
  23. 18 0
      frameworks/Java/spark/resin.xml
  24. 1 0
      frameworks/Java/spark/spark.dockerfile
  25. 18 0
      frameworks/Java/tapestry/resin.xml
  26. 1 0
      frameworks/Java/tapestry/tapestry.dockerfile
  27. 18 0
      frameworks/Java/wicket/resin.xml
  28. 1 0
      frameworks/Java/wicket/wicket.dockerfile

+ 1 - 0
frameworks/Clojure/compojure/compojure-raw.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=lein /compojure/target/hello-compojure-standalone.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 0
frameworks/Clojure/compojure/compojure.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=lein /compojure/target/hello-compojure-standalone.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Clojure/compojure/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Groovy/grails/grails.dockerfile

@@ -22,4 +22,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 RUN cp /grails/target/hello-0.1.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Groovy/grails/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/activeweb/activeweb-jackson.dockerfile

@@ -10,4 +10,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /activeweb/target/activeweb.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 0
frameworks/Java/activeweb/activeweb.dockerfile

@@ -10,4 +10,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /activeweb/target/activeweb.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/activeweb/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/curacao/curacao.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /curacao/target/curacao.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/curacao/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 1
frameworks/Java/gemini/gemini-mysql.dockerfile

@@ -16,5 +16,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /gemini/target/HelloWorld-0.0.1.war webapps/ROOT.war
-
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 1
frameworks/Java/gemini/gemini-postgres.dockerfile

@@ -16,5 +16,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /gemini/target/HelloWorld-0.0.1.war webapps/ROOT.war
-
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 1
frameworks/Java/gemini/gemini.dockerfile

@@ -16,5 +16,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /gemini/target/HelloWorld-0.0.1.war webapps/ROOT.war
-
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/gemini/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 18 - 0
frameworks/Java/revenj-jvm/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/revenj-jvm/revenj-jvm.dockerfile

@@ -19,4 +19,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /revenj-jvm/target/revenj.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/servlet/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/servlet/servlet-afterburner.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 0
frameworks/Java/servlet/servlet-cjs.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 0
frameworks/Java/servlet/servlet-mysql.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 0
frameworks/Java/servlet/servlet-postgresql.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 0
frameworks/Java/servlet/servlet.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/spark/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/spark/spark.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /spark/target/spark.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/tapestry/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/tapestry/tapestry.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /tapestry/target/tapestry.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 18 - 0
frameworks/Java/wicket/resin.xml

@@ -0,0 +1,18 @@
+<resin xmlns="http://caucho.com/ns/resin"
+       xmlns:resin="http://caucho.com/ns/resin/core">
+
+    <cluster id="">
+        <resin:import path="/resin/conf/app-default.xml" />
+        
+        <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
+
+        <server id="">
+            <http port="8080" />
+        </server>
+
+        <host>
+            <web-app-deploy path="/resin/webapps"
+                            expand-preserve-fileset="WEB-INF/work/**"/>
+        </host>
+    </cluster>
+</resin>

+ 1 - 0
frameworks/Java/wicket/wicket.dockerfile

@@ -9,4 +9,5 @@ WORKDIR /resin
 RUN curl -sL http://caucho.com/download/resin-4.0.56.tar.gz | tar xz --strip-components=1
 RUN rm -rf webapps/*
 COPY --from=maven /wicket/target/hellowicket-1.0.war webapps/ROOT.war
+COPY resin.xml conf/resin.xml
 CMD ["java", "-jar", "lib/resin.jar", "console"]