Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
[commons-codec "1.21.0"]
[org.bouncycastle/bcpkix-jdk18on "1.83"]
[org.openvoxproject/i18n ~i18n-version]
[org.openvoxproject/jruby-deps "9.4.12.1-1"]
[org.openvoxproject/jruby-deps "9.4.12.1-3"]
[org.openvoxproject/kitchensink "3.5.6"]
[org.openvoxproject/kitchensink "3.5.6" :classifier "test"]
[org.openvoxproject/ring-middleware "2.1.4"]
[org.openvoxproject/trapperkeeper "4.3.3"]
[org.openvoxproject/trapperkeeper "4.3.3" :classifier "test"]
[org.openvoxproject/ring-middleware "2.1.5"]
[org.openvoxproject/trapperkeeper "4.3.4"]
[org.openvoxproject/trapperkeeper "4.3.4" :classifier "test"]
[org.tcrawley/dynapath "1.1.0"]
[ring/ring-core "1.14.2"]
[prismatic/schema "1.4.1"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
(ns puppetlabs.services.jruby-pool-manager.impl.jruby-internal
(:require [clj-time.core :as time-core]
[clj-time.format :as time-format]
[clojure.java.io :as io]
(:require [clojure.java.io :as io]
[clojure.java.jmx :as jmx]
[clojure.string :refer [upper-case]]
[clojure.tools.logging :as log]
[me.raynes.fs :as fs]
[puppetlabs.i18n.core :as i18n]
[puppetlabs.services.jruby-pool-manager.jruby-schemas :as jruby-schemas]
[slingshot.slingshot :as sling]
[schema.core :as schema])
(:import (clojure.lang IFn)
(com.puppetlabs.jruby_utils.pool JRubyPool ReferencePool)
(java.time ZonedDateTime ZoneOffset)
(java.time.format DateTimeFormatter)
(com.puppetlabs.jruby_utils.jruby InternalScriptingContainer
ScriptingContainer)
(java.io File)
Expand Down Expand Up @@ -63,7 +62,8 @@
profiler-output-file :- schema/Str
profiling-mode :- schema/Keyword]
(when (and profiler-output-file (not= :off profiling-mode))
(let [current-time-string (time-format/unparse (time-format/formatters :basic-date-time-no-ms) (time-core/now))
(let [current-time-string (.format (ZonedDateTime/now ZoneOffset/UTC)
(DateTimeFormatter/ofPattern "yyyyMMdd'T'HHmmssZ"))
real-profiler-output-file (io/as-file (str profiler-output-file "-" (.hashCode jruby) "-" current-time-string))]
(doto jruby
(.setProfileOutput (ProfileOutput. ^File real-profiler-output-file))
Expand Down
Loading