statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Improved out message in probing and htmlize.

Browse source
This commit is contained in:
Christian P. MOMON 2021-05-25 15:05:39 +02:00
parent 078a6909a5
commit 6b4611f3b2
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/fr/devinsy/statoolinfos/core/Factory.java
View file

@ -166,6 +166,8 @@ public class Factory
{
Federation result;
System.out.println("Loading federation " + inputURL);
if (inputURL == null)
{
throw new IllegalArgumentException("Null input URL.");
@ -243,6 +245,8 @@ public class Factory
{
Metrics result;
System.out.println("Loading metrics " + inputURL);
File inputFile = cache.restoreFile(inputURL);
if (inputFile == null)
@ -284,6 +288,8 @@ public class Factory
{
Organization result;
System.out.println("Loading organization " + inputURL);
File inputFile = cache.restoreFile(inputURL);
if (inputFile == null)
@ -352,6 +358,8 @@ public class Factory
{
Service result;
System.out.println("Loading service " + inputURL);
File inputFile = cache.restoreFile(inputURL);
if (inputFile == null)

3
src/fr/devinsy/statoolinfos/metrics/http/HttpAccessLogAnalyzer.java
View file

@ -109,6 +109,7 @@ public class HttpAccessLogAnalyzer
*/
public void probe(final File file) throws IOException
{
System.out.println("Probing file [" + file.getAbsolutePath() + "]");
LineIterator iterator = new LineIterator(file);
while (iterator.hasNext())
{
@ -384,7 +385,7 @@ public class HttpAccessLogAnalyzer
String prefix = source.substring(0, source.length() - 1);
for (File file : new File(prefix).getParentFile().listFiles())
{
if (file.getName().startsWith(FilenameUtils.getBaseName(prefix)))
if (file.getName().startsWith(FilenameUtils.getName(prefix)))
{
analyzer.probe(file);
}