⬆ 升级 Latke

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Solo POM.
-    Version: 3.18.3.32, Oct 31, 2018
+    Version: 3.18.3.33, Nov 1, 2018
     Author: <a href="http://88250.b3log.org">Liang Ding</a>
     Author: <a href="http://www.annpeter.cn">Ann Peter</a>
     Author: <a href="http://vanessa.b3log.org">Vanessa</a>
@@ -75,7 +75,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <org.b3log.latke.version>2.4.25</org.b3log.latke.version>
+        <org.b3log.latke.version>2.4.26</org.b3log.latke.version>
 
         <servlet.version>3.1.0</servlet.version>
         <slf4j.version>1.7.5</slf4j.version>

src/main/java/org/b3log/solo/event/B3ArticleSender.java

@@ -23,7 +23,6 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
@@ -83,7 +82,9 @@ public class B3ArticleSender extends AbstractEventListener<JSONObject> {
 
             final JSONObject preference = preferenceQueryService.getPreference();
             if (null == preference) {
-                throw new EventException("Not found preference");
+                LOGGER.log(Level.ERROR, "Not found preference");
+
+                return;
             }
 
             if (StringUtils.isNotBlank(originalArticle.optString(Article.ARTICLE_VIEW_PWD))) {

src/main/java/org/b3log/solo/event/B3ArticleUpdater.java

@@ -23,7 +23,6 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
@@ -81,7 +80,9 @@ public class B3ArticleUpdater extends AbstractEventListener<JSONObject> {
 
             final JSONObject preference = preferenceQueryService.getPreference();
             if (null == preference) {
-                throw new EventException("Not found preference");
+                LOGGER.log(Level.ERROR, "Not found preference");
+
+                return;
             }
 
             if (StringUtils.isNotBlank(originalArticle.optString(Article.ARTICLE_VIEW_PWD))) {

src/main/java/org/b3log/solo/event/B3CommentSender.java

@@ -22,7 +22,6 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
@@ -69,7 +68,9 @@ public class B3CommentSender extends AbstractEventListener<JSONObject> {
 
             final JSONObject preference = preferenceQueryService.getPreference();
             if (null == preference) {
-                throw new EventException("Not found preference");
+                LOGGER.log(Level.ERROR, "Not found preference");
+
+                return;
             }
 
             if (Latkes.getServePath().contains("localhost") || Strings.isIPv4(Latkes.getServePath())) {

src/main/java/org/b3log/solo/event/PageCommentReplyNotifier.java

@@ -22,7 +22,6 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.AbstractEventListener;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.ioc.Singleton;
 import org.b3log.latke.logging.Level;
@@ -97,7 +96,9 @@ public class PageCommentReplyNotifier extends AbstractEventListener<JSONObject>
 
             final JSONObject preference = preferenceQueryService.getPreference();
             if (null == preference) {
-                throw new EventException("Not found preference");
+                LOGGER.log(Level.ERROR, "Not found preference");
+
+                return;
             }
 
             final String blogTitle = preference.getString(Option.ID_C_BLOG_TITLE);

src/main/java/org/b3log/solo/processor/ArticleProcessor.java

@@ -22,7 +22,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
@@ -786,11 +785,7 @@ public class ArticleProcessor {
             // Fire [Before Render Article] event
             final JSONObject eventData = new JSONObject();
             eventData.put(Article.ARTICLE, article);
-            try {
-                eventManager.fireEventSynchronously(new Event<>(EventTypes.BEFORE_RENDER_ARTICLE, eventData));
-            } catch (final EventException e) {
-                LOGGER.log(Level.ERROR, "Fires [" + EventTypes.BEFORE_RENDER_ARTICLE + "] event failed", e);
-            }
+            eventManager.fireEventSynchronously(new Event<>(EventTypes.BEFORE_RENDER_ARTICLE, eventData));
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, e.getMessage(), e);
 

src/main/java/org/b3log/solo/processor/console/AdminConsole.java

@@ -25,7 +25,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
@@ -513,18 +512,14 @@ public class AdminConsole {
      * @param dataModel        the specified data model
      */
     private void fireFreeMarkerActionEvent(final String hostTemplateName, final Map<String, Object> dataModel) {
-        try {
-            final ViewLoadEventData data = new ViewLoadEventData();
-
-            data.setViewName(hostTemplateName);
-            data.setDataModel(dataModel);
-            eventManager.fireEventSynchronously(new Event<>(Keys.FREEMARKER_ACTION, data));
-            if (StringUtils.isBlank((String) dataModel.get(Plugin.PLUGINS))) {
-                // There is no plugin for this template, fill ${plugins} with blank.
-                dataModel.put(Plugin.PLUGINS, "");
-            }
-        } catch (final EventException e) {
-            LOGGER.log(Level.WARN, "Event[FREEMARKER_ACTION] handle failed, ignores this exception for kernel health", e);
+        final ViewLoadEventData data = new ViewLoadEventData();
+
+        data.setViewName(hostTemplateName);
+        data.setDataModel(dataModel);
+        eventManager.fireEventSynchronously(new Event<>(Keys.FREEMARKER_ACTION, data));
+        if (StringUtils.isBlank((String) dataModel.get(Plugin.PLUGINS))) {
+            // There is no plugin for this template, fill ${plugins} with blank.
+            dataModel.put(Plugin.PLUGINS, "");
         }
     }
 

src/main/java/org/b3log/solo/service/ArticleMgmtService.java

@@ -22,7 +22,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
@@ -367,21 +366,13 @@ public class ArticleMgmtService {
                 final JSONObject eventData = new JSONObject();
                 eventData.put(ARTICLE, article);
                 eventData.put(Keys.RESULTS, ret);
-                try {
-                    eventManager.fireEventSynchronously(new Event<>(EventTypes.ADD_ARTICLE, eventData));
-                } catch (final EventException e) {
-                    LOGGER.log(Level.ERROR, e.getMessage(), e);
-                }
+                eventManager.fireEventSynchronously(new Event<>(EventTypes.ADD_ARTICLE, eventData));
             } else {
                 // Fire update article event
                 final JSONObject eventData = new JSONObject();
                 eventData.put(ARTICLE, article);
                 eventData.put(Keys.RESULTS, ret);
-                try {
-                    eventManager.fireEventSynchronously(new Event<>(EventTypes.UPDATE_ARTICLE, eventData));
-                } catch (final EventException e) {
-                    LOGGER.log(Level.ERROR, e.getMessage(), e);
-                }
+                eventManager.fireEventSynchronously(new Event<>(EventTypes.UPDATE_ARTICLE, eventData));
             }
 
             transaction.commit();
@@ -528,12 +519,10 @@ public class ArticleMgmtService {
             }
 
             article.remove(Common.POST_TO_COMMUNITY);
-        } catch (final RepositoryException e) {
+        } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Adds an article failed", e);
 
             throw new ServiceException(e);
-        } catch (final EventException e) {
-            LOGGER.log(Level.WARN, "Adds an article event process failed", e);
         }
 
         return ret;

src/main/java/org/b3log/solo/service/DataModelService.java

@@ -23,7 +23,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.event.Event;
-import org.b3log.latke.event.EventException;
 import org.b3log.latke.event.EventManager;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
@@ -592,17 +591,13 @@ public class DataModelService {
             }
 
             // Activates plugins
-            try {
-                final ViewLoadEventData data = new ViewLoadEventData();
-                data.setViewName("footer.ftl");
-                data.setDataModel(dataModel);
-                eventManager.fireEventSynchronously(new Event<>(Keys.FREEMARKER_ACTION, data));
-                if (StringUtils.isBlank((String) dataModel.get(Plugin.PLUGINS))) {
-                    // There is no plugin for this template, fill ${plugins} with blank.
-                    dataModel.put(Plugin.PLUGINS, "");
-                }
-            } catch (final EventException e) {
-                LOGGER.log(Level.WARN, "Event[FREEMARKER_ACTION] handle failed, ignores this exception for kernel health", e);
+            final ViewLoadEventData data = new ViewLoadEventData();
+            data.setViewName("footer.ftl");
+            data.setDataModel(dataModel);
+            eventManager.fireEventSynchronously(new Event<>(Keys.FREEMARKER_ACTION, data));
+            if (StringUtils.isBlank((String) dataModel.get(Plugin.PLUGINS))) {
+                // There is no plugin for this template, fill ${plugins} with blank.
+                dataModel.put(Plugin.PLUGINS, "");
             }
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Fills blog footer failed", e);