projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ae8a86c
)
✏️ Unify metric names
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 20 Nov 2019 15:45:51 +0000
(16:45 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 20 Nov 2019 15:45:51 +0000
(16:45 +0100)
src/main/java/net/pterodactylus/sone/core/SoneParser.java
patch
|
blob
|
history
src/main/resources/i18n/sone.en.properties
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/core/SoneParserTest.kt
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/SoneParser.java
b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
index
d82dab5
..
e1fd9ff
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/SoneParser.java
+++ b/
src/main/java/net/pterodactylus/sone/core/SoneParser.java
@@
-33,7
+33,7
@@
public class SoneParser {
@Inject
public SoneParser(Database database, MetricRegistry metricRegistry) {
this.database = database;
@Inject
public SoneParser(Database database, MetricRegistry metricRegistry) {
this.database = database;
- this.soneParsingDurationHistogram = metricRegistry.histogram("sone.pars
ing
.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
+ this.soneParsingDurationHistogram = metricRegistry.histogram("sone.pars
e
.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
}
@Nullable
}
@Nullable
diff --git
a/src/main/resources/i18n/sone.en.properties
b/src/main/resources/i18n/sone.en.properties
index
ed3479a
..
a23730c
100644
(file)
--- a/
src/main/resources/i18n/sone.en.properties
+++ b/
src/main/resources/i18n/sone.en.properties
@@
-336,7
+336,7
@@
Page.Invalid.Text=An invalid action was performed, or the action was valid but t
Page.Metrics.Title=Metrics
Page.Metrics.Page.Title=Metrics
Page.Metrics.SoneInsertDuration.Title=Sone Insert Duration
Page.Metrics.Title=Metrics
Page.Metrics.Page.Title=Metrics
Page.Metrics.SoneInsertDuration.Title=Sone Insert Duration
-Page.Metrics.SonePars
ingDuration.Title=Sone Parsing
Duration
+Page.Metrics.SonePars
eDuration.Title=Sone Parse
Duration
Page.Metrics.ConfigurationSaveDuration.Title=Configuration Save Duration
View.Search.Button.Search=Search
Page.Metrics.ConfigurationSaveDuration.Title=Configuration Save Duration
View.Search.Button.Search=Search
diff --git
a/src/test/kotlin/net/pterodactylus/sone/core/SoneParserTest.kt
b/src/test/kotlin/net/pterodactylus/sone/core/SoneParserTest.kt
index
6d9d4b8
..
336d855
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/core/SoneParserTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/core/SoneParserTest.kt
@@
-401,7
+401,7
@@
class SoneParserTest {
fun `unsuccessful parsing does not add a histogram entry`() {
val inputStream = javaClass.getResourceAsStream("sone-parser-with-invalid-image-height.xml")
assertThat(soneParser.parseSone(sone, inputStream), nullValue())
fun `unsuccessful parsing does not add a histogram entry`() {
val inputStream = javaClass.getResourceAsStream("sone-parser-with-invalid-image-height.xml")
assertThat(soneParser.parseSone(sone, inputStream), nullValue())
- val histogram = metricRegistry.histogram("sone.pars
ing
.duration")
+ val histogram = metricRegistry.histogram("sone.pars
e
.duration")
assertThat(histogram.count, equalTo(0L))
}
assertThat(histogram.count, equalTo(0L))
}
@@
-409,7
+409,7
@@
class SoneParserTest {
fun `successful parsing adds histogram entry`() {
val inputStream = javaClass.getResourceAsStream("sone-parser-without-images.xml")
assertThat(soneParser.parseSone(sone, inputStream), notNullValue())
fun `successful parsing adds histogram entry`() {
val inputStream = javaClass.getResourceAsStream("sone-parser-without-images.xml")
assertThat(soneParser.parseSone(sone, inputStream), notNullValue())
- val histogram = metricRegistry.histogram("sone.pars
ing
.duration")
+ val histogram = metricRegistry.histogram("sone.pars
e
.duration")
assertThat(histogram.count, equalTo(1L))
}
assertThat(histogram.count, equalTo(1L))
}