From 9c7a682f3e891b86fb1c14a881d360dcf65e7d47 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <orsinije@fr.ibm.com>
Date: Sun, 15 Oct 2017 17:15:01 +0200
Subject: [PATCH] improved

---
 war/server.xml                                     |  7 +++-
 .../main/java/pnews/servlet/ArticleProvider.java   | 41 +++++++++++++++-------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/war/server.xml b/war/server.xml
index 4379311..e800ec1 100644
--- a/war/server.xml
+++ b/war/server.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server description="Default server">
+        <logging traceSpecification="pnews.*=FINEST:*=INFO"
+                 consoleLogLevel="INFO"
+                 logDirectory="/tmp"
+                 maxFileSize="50"
+                 traceFileName="trace.log"
+                 maxFiles="10" />
 
-        <logging traceSpecification="*=audit:pnews.*=FINE" consoleLogLevel="INFO" />
     <!-- Enable features -->
     <featureManager>
         <feature>servlet-3.1</feature>
diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java
index 010317a..ddec874 100644
--- a/war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/war/src/main/java/pnews/servlet/ArticleProvider.java
@@ -37,7 +37,7 @@ public class ArticleProvider {
         
         private ArticleProvider() {      
                 for (Category cat:Category.values())
-                        scheduler.scheduleAtFixedRate(new Refresher(cat), 2, 120, TimeUnit.SECONDS);
+                        scheduler.scheduleAtFixedRate(new Refresher(cat), 2, 600, TimeUnit.SECONDS);
         }
         
         private static SyndFeed getSyndFeed(String u) throws IllegalArgumentException, FeedException, MalformedURLException, IOException {
@@ -56,10 +56,12 @@ public class ArticleProvider {
                 result.put(Category.TOP,
                            new String[] {
                                            "http://www.francetvinfo.fr/titres.rss",
-                                           "http://www.france24.com/fr/actualites/rss",
-                                           //"https://www.franceinter.fr/rss/a-la-une.xml",
+                                           "http://www.france24.com/fr/actualites/rss",                                           
                                            "http://www.rfi.fr/general/rss",
                                            "http://www.cnews.fr/rss/une",
+                                           "http://www.ladepeche.fr/rss/a-la-une.rss",
+                                           "https://www.franceinter.fr/rss/a-la-une.xml",
+                                           "https://www.francebleu.fr/rss/a-la-une.xml",
                                            "http://www.bfmtv.com/rss/info/flux-rss/flux-toutes-les-actualites/"
                            });
                 
@@ -96,12 +98,14 @@ public class ArticleProvider {
         
         private void addArticles(Category cat, SyndFeed feed) {
                 String thumbnail;
-                String desc, link, title;
+                String desc, link, title, feedTitle;
                 Date date;
                 List<Article> articles;
                 boolean exist;
                 
-                LOG.info("addArticles" + cat.getId());
+                feedTitle = feed.getTitle().trim();
+                
+                LOG.info("addArticles " + cat.getId() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
                 
                 for (SyndEntry entry: feed.getEntries()) {
                         thumbnail = null;
@@ -111,20 +115,26 @@ public class ArticleProvider {
                                 break;
                         }
                                 
+                        title = entry.getTitle().trim();
+                        
                         if (entry.getDescription() != null) {                                      
                                 desc = Jsoup.parse(entry.getDescription().getValue()).text();
                         } else {       
                                 desc = null;
-                                LOG.severe("No description for " + feed.getTitle() + " - " + entry.getTitle());
+                                LOG.severe("No description for " + feedTitle + " - " + title);
                         }
                         
                         date = entry.getPublishedDate();
                         if (date == null)
                                 date = entry.getUpdatedDate();
+                        if (date == null) {
+                                LOG.severe("The article " + feedTitle + " - " + title + " does not have a date");
+                                continue;
+                        }                                
                         
                         synchronized(articlesByCategory) {
                                 link = entry.getLink().trim();
-                                title = entry.getTitle().trim();
+
                                 articles = articlesByCategory.get(cat);
                                 exist = false;
                                 if (articles == null) {
@@ -133,13 +143,13 @@ public class ArticleProvider {
                                 } else {                                
                                         for (Article a: articles)
                                                 if (a.link.equals(link)) {
-                                                        LOG.finest(link + " already present");
+                                                        LOG.info("addArticles " + link + " already present");
                                                         exist = true;
                                                 }
                                 }
                                 
                                 if (!exist) {
-                                        LOG.info("add " + cat.getId() + " " + feed.getTitle() + " " + title);
+                                        LOG.fine("add " + cat.getId() + " " + feedTitle + " " + title);
                                 
                                         articles.add(new Article(link, cat, title, desc, thumbnail, date,
                                                         feed.getTitle()));
@@ -151,9 +161,13 @@ public class ArticleProvider {
                                                 }
 
                                         });
+                                } else {
+                                        LOG.finest("addArticles already exist: " + title);
                                 }
                         }
-                }               
+                }          
+                
+                LOG.info("addArticles done " + cat.getId());
         }
         
         private void retrieveArticles(Category cat) throws IllegalArgumentException, MalformedURLException, FeedException, IOException {
@@ -165,8 +179,10 @@ public class ArticleProvider {
                         for (String str: feeds)
                                 try {
                                         addArticles(cat, getSyndFeed(str));
-                                } catch (IOException e) {
-                                        LOG.log(Level.SEVERE, "retrieveArticles failure " + cat.getId(), e);
+                                } catch (Throwable e) {
+                                        LOG.log(Level.SEVERE,
+                                                "retrieveArticles failure " + cat.getId() + " " + str,
+                                                e);
                                 }
                 else
                         LOG.severe("No feed for category " + cat);
@@ -202,6 +218,7 @@ public class ArticleProvider {
                                                                        articles.subList(0, 100));
                                                                 
                                         }
+                                        LOG.info("refresher " + category.getId() + " number of articles: " + articles.size());
                                 }
                         } catch (IllegalArgumentException | FeedException | IOException e) {
                                 LOG.log(Level.SEVERE, "refresher failure", e);
-- 
2.7.4