diff --git a/README.md b/README.md index 05df80a..0681cc5 100644 --- a/README.md +++ b/README.md @@ -186,16 +186,6 @@ conf.probe.gitea.database.password= conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties ``` -### GSL metrics - -Configuration template: - -``` -conf.probe.types=GSL -conf.probe.gsl.stats=/foo/bar/stats.properties -conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties -``` - ### LibreQR metrics Configuration template: diff --git a/src/fr/devinsy/statoolinfos/metrics/Prober.java b/src/fr/devinsy/statoolinfos/metrics/Prober.java index 9c0fd27..a92423e 100644 --- a/src/fr/devinsy/statoolinfos/metrics/Prober.java +++ b/src/fr/devinsy/statoolinfos/metrics/Prober.java @@ -42,7 +42,6 @@ import fr.devinsy.statoolinfos.core.StatoolInfosException; import fr.devinsy.statoolinfos.core.StatoolInfosUtils; import fr.devinsy.statoolinfos.metrics.etherpad.EtherpadProber; import fr.devinsy.statoolinfos.metrics.gitea.GiteaProber; -import fr.devinsy.statoolinfos.metrics.gsl.GSLProber; import fr.devinsy.statoolinfos.metrics.httpaccess.HttpAccessLogAnalyzer; import fr.devinsy.statoolinfos.metrics.httpaccess.HttpAccessLogs; import fr.devinsy.statoolinfos.metrics.httperrorlog.HttpErrorLogAnalyzer; @@ -313,32 +312,6 @@ public class Prober return result; } - /** - * Probe GSL. - * - * @param configuration - * the configuration - * @return the path counters - * @throws IOException - * Signals that an I/O exception has occurred. - * @throws StatoolInfosException - * the statool infos exception - */ - public static PathCounters probeGSL(final Configuration configuration) throws IOException, StatoolInfosException - { - PathCounters result; - - logger.info("== Probing GSL."); - - File statsFile = configuration.getAsFile("conf.probe.gsl.stats"); - logger.info("statsfile=[{}]", statsFile); - - result = GSLProber.probe(statsFile); - - // - return result; - } - /** * Probe htt access log. * diff --git a/src/fr/devinsy/statoolinfos/metrics/gsl/GSLProber.java b/src/fr/devinsy/statoolinfos/metrics/gsl/GSLProber.java deleted file mode 100644 index 08e3635..0000000 --- a/src/fr/devinsy/statoolinfos/metrics/gsl/GSLProber.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (C) 2022 Christian Pierre MOMON - * - * This file is part of StatoolInfos, simple service statistics tool. - * - * StatoolInfos is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * StatoolInfos is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with StatoolInfos. If not, see . - */ -package fr.devinsy.statoolinfos.metrics.gsl; - -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.Properties; - -import org.apache.commons.lang3.math.NumberUtils; - -import fr.devinsy.statoolinfos.core.StatoolInfosException; -import fr.devinsy.statoolinfos.metrics.PathCounters; -import fr.devinsy.strings.StringList; - -/** - * The Class GSLProber. - */ -public class GSLProber -{ - /** - * Instantiates a new GSL prober. - */ - private GSLProber() - { - } - - /** - * Probe. - * - * @param statsFile - * the stats file - * @return the path counters - * @throws IOException - * Signals that an I/O exception has occurred. - * @throws StatoolInfosException - * the statool infos exception - */ - public static PathCounters probe(final File statsFile) throws IOException, StatoolInfosException - { - PathCounters result; - - result = new PathCounters(); - - // - Properties properties = new Properties(); - properties.load(new FileReader(statsFile)); - - StringList timemarks = result.getNowTimeMarks(); - - // metrics.gsl.articles = - String value = properties.getProperty("gsl.articles"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.articles", timemarks); - } - - // metrics.gsl.articles.pages= - value = properties.getProperty("gsl.articles.pages"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.articles.pages", timemarks); - } - - // metrics.gsl.articles.posts= - value = properties.getProperty("gsl.articles.posts"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.articles.posts", timemarks); - } - - // metrics.gsl.authors = - value = properties.getProperty("gsl.authors"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.authors", timemarks); - } - - // gsl.articles.tags - value = properties.getProperty("gsl.tags"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.tags", timemarks); - } - - // gsl.articles.words - value = properties.getProperty("gsl.words"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.words", timemarks); - } - - // gsl.articles.quotes - value = properties.getProperty("gsl.quotes"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.quotes", timemarks); - } - - // gsl.articles.paragraphs - value = properties.getProperty("gsl.paragraphs"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.paragraphs", timemarks); - } - - // gsl.articles.links - value = properties.getProperty("gsl.links"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.links", timemarks); - } - - // gsl.articles.links.online - value = properties.getProperty("gsl.online"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.online", timemarks); - } - - // gsl.articles.lists - value = properties.getProperty("gsl.lists"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.lists", timemarks); - } - - // gsl.articles.lists.items - value = properties.getProperty("gsl.items"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.items", timemarks); - } - - // gsl_articles.images - value = properties.getProperty("gsl.images"); - if (NumberUtils.isDigits(value)) - { - result.set(Long.valueOf(value), "metrics.gsl.authors", timemarks); - } - - // - return result; - } -}