Commit 4acc9b1f authored by Liang Ding's avatar Liang Ding

#267

依赖最新的 Latke。
GAE 版由于 GAE runtime 默认是 JDK logging,所以用的是 slf4j-jdk14,其他版本都是使用
slf4j-log4j12
parent 2c33e79e
...@@ -83,6 +83,12 @@ ...@@ -83,6 +83,12 @@
<groupId>org.tautua.markdownpapers</groupId> <groupId>org.tautua.markdownpapers</groupId>
<artifactId>markdownpapers-core</artifactId> <artifactId>markdownpapers-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -17,8 +17,6 @@ package org.b3log.solo; ...@@ -17,8 +17,6 @@ package org.b3log.solo;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletRequestEvent; import javax.servlet.ServletRequestEvent;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -26,6 +24,8 @@ import javax.servlet.http.HttpSession; ...@@ -26,6 +24,8 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionEvent;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.event.EventManager; import org.b3log.latke.event.EventManager;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.plugin.PluginManager; import org.b3log.latke.plugin.PluginManager;
import org.b3log.latke.plugin.ViewLoadEventHandler; import org.b3log.latke.plugin.ViewLoadEventHandler;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
...@@ -134,7 +134,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -134,7 +134,7 @@ public final class SoloServletListener extends AbstractServletListener {
LOGGER.info("Initialized the context"); LOGGER.info("Initialized the context");
Stopwatchs.end(); Stopwatchs.end();
LOGGER.log(Level.FINE, "Stopwatch: {0}{1}", new Object[] {Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()}); LOGGER.log(Level.DEBUG, "Stopwatch: {0}{1}", new Object[] {Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()});
} }
@Override @Override
...@@ -159,13 +159,13 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -159,13 +159,13 @@ public final class SoloServletListener extends AbstractServletListener {
Stopwatchs.start("Request Initialized[requestURI=" + requestURI + "]"); Stopwatchs.start("Request Initialized[requestURI=" + requestURI + "]");
if (Requests.searchEngineBotRequest(httpServletRequest)) { if (Requests.searchEngineBotRequest(httpServletRequest)) {
LOGGER.log(Level.FINER, "Request made from a search engine[User-Agent={0}]", httpServletRequest.getHeader("User-Agent")); LOGGER.log(Level.DEBUG, "Request made from a search engine[User-Agent={0}]", httpServletRequest.getHeader("User-Agent"));
httpServletRequest.setAttribute(Keys.HttpRequest.IS_SEARCH_ENGINE_BOT, true); httpServletRequest.setAttribute(Keys.HttpRequest.IS_SEARCH_ENGINE_BOT, true);
} else { } else {
// Gets the session of this request // Gets the session of this request
final HttpSession session = httpServletRequest.getSession(); final HttpSession session = httpServletRequest.getSession();
LOGGER.log(Level.FINE, "Gets a session[id={0}, remoteAddr={1}, User-Agent={2}, isNew={3}]", new Object[] { LOGGER.log(Level.DEBUG, "Gets a session[id={0}, remoteAddr={1}, User-Agent={2}, isNew={3}]", new Object[] {
session.getId(), httpServletRequest.getRemoteAddr(), httpServletRequest.getHeader("User-Agent"), session.isNew()}); session.getId(), httpServletRequest.getRemoteAddr(), httpServletRequest.getHeader("User-Agent"), session.isNew()});
// Online visitor count // Online visitor count
Statistics.onlineVisitorCount(httpServletRequest); Statistics.onlineVisitorCount(httpServletRequest);
...@@ -178,7 +178,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -178,7 +178,7 @@ public final class SoloServletListener extends AbstractServletListener {
public void requestDestroyed(final ServletRequestEvent servletRequestEvent) { public void requestDestroyed(final ServletRequestEvent servletRequestEvent) {
Stopwatchs.end(); Stopwatchs.end();
LOGGER.log(Level.FINE, "Stopwatch: {0}{1}", new Object[] {Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()}); LOGGER.log(Level.DEBUG, "Stopwatch: {0}{1}", new Object[] {Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()});
Stopwatchs.release(); Stopwatchs.release();
super.requestDestroyed(servletRequestEvent); super.requestDestroyed(servletRequestEvent);
...@@ -210,7 +210,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -210,7 +210,7 @@ public final class SoloServletListener extends AbstractServletListener {
try { try {
preference = preferenceRepository.get(Preference.PREFERENCE); preference = preferenceRepository.get(Preference.PREFERENCE);
if (null == preference) { if (null == preference) {
LOGGER.log(Level.WARNING, "Can't not init default skin, please init B3log Solo first"); LOGGER.log(Level.WARN, "Can't not init default skin, please init B3log Solo first");
return; return;
} }
...@@ -220,7 +220,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -220,7 +220,7 @@ public final class SoloServletListener extends AbstractServletListener {
Templates.enableCache(pageCacheEnabled); Templates.enableCache(pageCacheEnabled);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
...@@ -240,7 +240,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -240,7 +240,7 @@ public final class SoloServletListener extends AbstractServletListener {
return null != admin; return null != admin;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.WARNING, "B3log Solo has not been initialized"); LOGGER.log(Level.WARN, "B3log Solo has not been initialized");
return false; return false;
} }
} }
...@@ -271,7 +271,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -271,7 +271,7 @@ public final class SoloServletListener extends AbstractServletListener {
// Cache // Cache
eventManager.registerListener(new RemoveCacheListener()); eventManager.registerListener(new RemoveCacheListener());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Register event processors error", e); LOGGER.log(Level.ERROR, "Register event processors error", e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
...@@ -302,12 +302,12 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -302,12 +302,12 @@ public final class SoloServletListener extends AbstractServletListener {
desiredView = preference.getString(Skin.SKIN_DIR_NAME); desiredView = preference.getString(Skin.SKIN_DIR_NAME);
} else { } else {
desiredView = "mobile"; desiredView = "mobile";
LOGGER.log(Level.FINER, "The request [URI={0}] comes frome mobile device", requestURI); LOGGER.log(Level.DEBUG, "The request [URI={0}] comes frome mobile device", requestURI);
} }
httpServletRequest.setAttribute(Keys.TEMAPLTE_DIR_NAME, desiredView); httpServletRequest.setAttribute(Keys.TEMAPLTE_DIR_NAME, desiredView);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Resolves skin failed", e); LOGGER.log(Level.ERROR, "Resolves skin failed", e);
} }
} }
} }
...@@ -19,8 +19,6 @@ package org.b3log.solo.api.metaweblog; ...@@ -19,8 +19,6 @@ package org.b3log.solo.api.metaweblog;
import java.text.ParseException; import java.text.ParseException;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletInputStream; import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -30,6 +28,8 @@ import org.apache.commons.lang.time.DateFormatUtils; ...@@ -30,6 +28,8 @@ import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -290,7 +290,7 @@ public final class MetaWeblogAPI { ...@@ -290,7 +290,7 @@ public final class MetaWeblogAPI {
throw new UnsupportedOperationException("Unsupported method[name=" + methodName + "]"); throw new UnsupportedOperationException("Unsupported method[name=" + methodName + "]");
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final StringBuilder stringBuilder = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?><methodResponse>").append("<fault><value><struct>").append("<member><name>faultCode</name><value><int>500</int></value></member>").append("<member><name>faultString</name><value><string>").append(e.getMessage()).append( final StringBuilder stringBuilder = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?><methodResponse>").append("<fault><value><struct>").append("<member><name>faultCode</name><value><int>500</int></value></member>").append("<member><name>faultString</name><value><string>").append(e.getMessage()).append(
"</string></value></member></struct></value></fault></methodResponse>"); "</string></value></member></struct></value></fault></methodResponse>");
...@@ -367,7 +367,7 @@ public final class MetaWeblogAPI { ...@@ -367,7 +367,7 @@ public final class MetaWeblogAPI {
try { try {
date = (Date) DateFormatUtils.ISO_DATETIME_FORMAT.parseObject(dateString); date = (Date) DateFormatUtils.ISO_DATETIME_FORMAT.parseObject(dateString);
} catch (final ParseException e) { } catch (final ParseException e) {
LOGGER.log(Level.WARNING, LOGGER.log(Level.WARN,
"Parses article create date failed with ISO8601, retry to parse with " "Parses article create date failed with ISO8601, retry to parse with "
+ "pattern[yyyy-MM-dd'T'HH:mm:ss, yyyyMMdd'T'HH:mm:ss'Z']"); + "pattern[yyyy-MM-dd'T'HH:mm:ss, yyyyMMdd'T'HH:mm:ss'Z']");
date = DateUtils.parseDate(dateString, new String[] {"yyyyMMdd'T'HH:mm:ss", "yyyyMMdd'T'HH:mm:ss'Z'"}); date = DateUtils.parseDate(dateString, new String[] {"yyyyMMdd'T'HH:mm:ss", "yyyyMMdd'T'HH:mm:ss'Z'"});
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
package org.b3log.solo.api.symphony; package org.b3log.solo.api.symphony;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
...@@ -123,7 +123,7 @@ public final class ArticleReceiver { ...@@ -123,7 +123,7 @@ public final class ArticleReceiver {
final JSONObject preference = preferenceQueryService.getPreference(); final JSONObject preference = preferenceQueryService.getPreference();
if (!userB3Key.equals(preference.optString(Preference.KEY_OF_SOLO))) { if (!userB3Key.equals(preference.optString(Preference.KEY_OF_SOLO))) {
LOGGER.log(Level.WARNING, "B3 key not match, ignored add article"); LOGGER.log(Level.WARN, "B3 key not match, ignored add article");
return; return;
} }
...@@ -159,7 +159,7 @@ public final class ArticleReceiver { ...@@ -159,7 +159,7 @@ public final class ArticleReceiver {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -216,7 +216,7 @@ public final class ArticleReceiver { ...@@ -216,7 +216,7 @@ public final class ArticleReceiver {
final JSONObject preference = preferenceQueryService.getPreference(); final JSONObject preference = preferenceQueryService.getPreference();
if (!userB3Key.equals(preference.optString(Preference.KEY_OF_SOLO))) { if (!userB3Key.equals(preference.optString(Preference.KEY_OF_SOLO))) {
LOGGER.log(Level.WARNING, "B3 key not match, ignored update article"); LOGGER.log(Level.WARN, "B3 key not match, ignored update article");
return; return;
} }
...@@ -253,7 +253,7 @@ public final class ArticleReceiver { ...@@ -253,7 +253,7 @@ public final class ArticleReceiver {
ret.put(Keys.MSG, "update article succ"); ret.put(Keys.MSG, "update article succ");
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -21,8 +21,6 @@ import java.net.MalformedURLException; ...@@ -21,8 +21,6 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
...@@ -30,6 +28,8 @@ import org.b3log.latke.Keys; ...@@ -30,6 +28,8 @@ import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventManager; import org.b3log.latke.event.EventManager;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
...@@ -197,7 +197,7 @@ public final class CommentReceiver { ...@@ -197,7 +197,7 @@ public final class CommentReceiver {
try { try {
new URL(commentURL); new URL(commentURL);
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
LOGGER.log(Level.WARNING, "The comment URL is invalid [{0}]", commentURL); LOGGER.log(Level.WARN, "The comment URL is invalid [{0}]", commentURL);
commentURL = ""; commentURL = "";
} }
...@@ -232,7 +232,7 @@ public final class CommentReceiver { ...@@ -232,7 +232,7 @@ public final class CommentReceiver {
} else { } else {
comment.put(Comment.COMMENT_ORIGINAL_COMMENT_ID, ""); comment.put(Comment.COMMENT_ORIGINAL_COMMENT_ID, "");
comment.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, ""); comment.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, "");
LOGGER.log(Level.WARNING, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]", LOGGER.log(Level.WARN, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]",
new String[] {originalCommentId, commentName, commentContent}); new String[] {originalCommentId, commentName, commentContent});
} }
} else { } else {
...@@ -260,7 +260,7 @@ public final class CommentReceiver { ...@@ -260,7 +260,7 @@ public final class CommentReceiver {
try { try {
Comments.sendNotificationMail(article, comment, originalComment, preference); Comments.sendNotificationMail(article, comment, originalComment, preference);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.WARNING, "Send mail failed", e); LOGGER.log(Level.WARN, "Send mail failed", e);
} }
// Step 5: Fire add comment event // Step 5: Fire add comment event
final JSONObject eventData = new JSONObject(); final JSONObject eventData = new JSONObject();
...@@ -279,7 +279,7 @@ public final class CommentReceiver { ...@@ -279,7 +279,7 @@ public final class CommentReceiver {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -347,21 +347,21 @@ public final class CommentReceiver { ...@@ -347,21 +347,21 @@ public final class CommentReceiver {
thumbnailURL = "http://secure.gravatar.com/avatar/" + hashedEmail + "?s=" + size + "&d=" + Latkes.getServePath() thumbnailURL = "http://secure.gravatar.com/avatar/" + hashedEmail + "?s=" + size + "&d=" + Latkes.getServePath()
+ "/images/default-user-thumbnail.png"; + "/images/default-user-thumbnail.png";
comment.put(Comment.COMMENT_THUMBNAIL_URL, thumbnailURL); comment.put(Comment.COMMENT_THUMBNAIL_URL, thumbnailURL);
LOGGER.log(Level.FINEST, "Comment thumbnail[URL={0}]", thumbnailURL); LOGGER.log(Level.TRACE, "Comment thumbnail[URL={0}]", thumbnailURL);
return; return;
} }
} else { } else {
LOGGER.log(Level.WARNING, "Can not fetch thumbnail from Gravatar[commentEmail={0}, statusCode={1}]", LOGGER.log(Level.WARN, "Can not fetch thumbnail from Gravatar[commentEmail={0}, statusCode={1}]",
new Object[] {commentEmail, statusCode}); new Object[] {commentEmail, statusCode});
} }
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.warning(e.getMessage()); LOGGER.warn(e.getMessage());
LOGGER.log(Level.WARNING, "Can not fetch thumbnail from Gravatar[commentEmail={0}]", commentEmail); LOGGER.log(Level.WARN, "Can not fetch thumbnail from Gravatar[commentEmail={0}]", commentEmail);
} }
if (null == thumbnailURL) { if (null == thumbnailURL) {
LOGGER.log(Level.WARNING, "Not supported yet for comment thumbnail for email[{0}]", commentEmail); LOGGER.log(Level.WARN, "Not supported yet for comment thumbnail for email[{0}]", commentEmail);
thumbnailURL = "/images/" + DEFAULT_USER_THUMBNAIL; thumbnailURL = "/images/" + DEFAULT_USER_THUMBNAIL;
comment.put(Comment.COMMENT_THUMBNAIL_URL, thumbnailURL); comment.put(Comment.COMMENT_THUMBNAIL_URL, thumbnailURL);
} }
......
...@@ -18,13 +18,13 @@ package org.b3log.solo.dev; ...@@ -18,13 +18,13 @@ package org.b3log.solo.dev;
import java.io.IOException; import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeMode; import org.b3log.latke.RuntimeMode;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -64,7 +64,7 @@ public final class ArticleGenerator { ...@@ -64,7 +64,7 @@ public final class ArticleGenerator {
public void genArticles(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) public void genArticles(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response)
throws IOException { throws IOException {
if (RuntimeMode.DEVELOPMENT != Latkes.getRuntimeMode()) { if (RuntimeMode.DEVELOPMENT != Latkes.getRuntimeMode()) {
LOGGER.log(Level.WARNING, "Article generation just for development mode, " + "current runtime mode is [{0}]", LOGGER.log(Level.WARN, "Article generation just for development mode, " + "current runtime mode is [{0}]",
Latkes.getRuntimeMode()); Latkes.getRuntimeMode());
response.sendRedirect(Latkes.getServePath()); response.sendRedirect(Latkes.getServePath());
...@@ -117,7 +117,7 @@ public final class ArticleGenerator { ...@@ -117,7 +117,7 @@ public final class ArticleGenerator {
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
Stopwatchs.end(); Stopwatchs.end();
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
package org.b3log.solo.event.cache; package org.b3log.solo.event.cache;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.solo.service.StatisticMgmtService; import org.b3log.solo.service.StatisticMgmtService;
...@@ -51,13 +51,13 @@ public final class RemoveCacheListener extends AbstractEventListener<Void> { ...@@ -51,13 +51,13 @@ public final class RemoveCacheListener extends AbstractEventListener<Void> {
@Override @Override
public void action(final Event<Void> event) throws EventException { public void action(final Event<Void> event) throws EventException {
LOGGER.log(Level.FINER, "Processing an event[type={0} in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0} in listener[className={2}]",
new Object[] {event.getType(), RemoveCacheListener.class.getName()}); new Object[] {event.getType(), RemoveCacheListener.class.getName()});
try { try {
statisticMgmtService.flushStatistic(); statisticMgmtService.flushStatistic();
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, "Flushes statistic to repository failed", e); LOGGER.log(Level.ERROR, "Flushes statistic to repository failed", e);
} }
} }
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
package org.b3log.solo.event.comment; package org.b3log.solo.event.comment;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.mail.MailService; import org.b3log.latke.mail.MailService;
import org.b3log.latke.mail.MailService.Message; import org.b3log.latke.mail.MailService.Message;
import org.b3log.latke.mail.MailServiceFactory; import org.b3log.latke.mail.MailServiceFactory;
...@@ -73,12 +73,12 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO ...@@ -73,12 +73,12 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
final JSONObject comment = eventData.optJSONObject(Comment.COMMENT); final JSONObject comment = eventData.optJSONObject(Comment.COMMENT);
final JSONObject article = eventData.optJSONObject(Article.ARTICLE); final JSONObject article = eventData.optJSONObject(Article.ARTICLE);
LOGGER.log(Level.FINER, "Processing an event[type={0}, data={1}] in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
new Object[] {event.getType(), eventData, ArticleCommentReplyNotifier.class.getName()}); new Object[] {event.getType(), eventData, ArticleCommentReplyNotifier.class.getName()});
final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID); final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID);
if (Strings.isEmptyOrNull(originalCommentId)) { if (Strings.isEmptyOrNull(originalCommentId)) {
LOGGER.log(Level.FINER, "This comment[id={0}] is not a reply", comment.optString(Keys.OBJECT_ID)); LOGGER.log(Level.DEBUG, "This comment[id={0}] is not a reply", comment.optString(Keys.OBJECT_ID));
return; return;
} }
...@@ -126,12 +126,12 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO ...@@ -126,12 +126,12 @@ public final class ArticleCommentReplyNotifier extends AbstractEventListener<JSO
"${replyContent}", commentContent); "${replyContent}", commentContent);
message.setHtmlBody(mailBody); message.setHtmlBody(mailBody);
LOGGER.log(Level.FINER, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]", LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
new Object[] {mailSubject, mailBody, originalCommentEmail}); new Object[] {mailSubject, mailBody, originalCommentEmail});
mailService.send(message); mailService.send(message);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new EventException("Reply notifier error!"); throw new EventException("Reply notifier error!");
} }
} }
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
package org.b3log.solo.event.comment; package org.b3log.solo.event.comment;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.mail.MailService; import org.b3log.latke.mail.MailService;
import org.b3log.latke.mail.MailService.Message; import org.b3log.latke.mail.MailService.Message;
import org.b3log.latke.mail.MailServiceFactory; import org.b3log.latke.mail.MailServiceFactory;
...@@ -73,12 +73,12 @@ public final class PageCommentReplyNotifier extends AbstractEventListener<JSONOb ...@@ -73,12 +73,12 @@ public final class PageCommentReplyNotifier extends AbstractEventListener<JSONOb
final JSONObject comment = eventData.optJSONObject(Comment.COMMENT); final JSONObject comment = eventData.optJSONObject(Comment.COMMENT);
final JSONObject page = eventData.optJSONObject(Page.PAGE); final JSONObject page = eventData.optJSONObject(Page.PAGE);
LOGGER.log(Level.FINER, "Processing an event[type={0}, data={1}] in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
new Object[] {event.getType(), eventData, PageCommentReplyNotifier.class.getName()}); new Object[] {event.getType(), eventData, PageCommentReplyNotifier.class.getName()});
final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID); final String originalCommentId = comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID);
if (Strings.isEmptyOrNull(originalCommentId)) { if (Strings.isEmptyOrNull(originalCommentId)) {
LOGGER.log(Level.FINER, "This comment[id={0}] is not a reply", comment.optString(Keys.OBJECT_ID)); LOGGER.log(Level.DEBUG, "This comment[id={0}] is not a reply", comment.optString(Keys.OBJECT_ID));
return; return;
} }
...@@ -126,11 +126,11 @@ public final class PageCommentReplyNotifier extends AbstractEventListener<JSONOb ...@@ -126,11 +126,11 @@ public final class PageCommentReplyNotifier extends AbstractEventListener<JSONOb
"${replyContent}", commentContent); "${replyContent}", commentContent);
message.setHtmlBody(mailBody); message.setHtmlBody(mailBody);
LOGGER.log(Level.FINER, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]", LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]",
new Object[] {mailSubject, mailBody, originalCommentEmail}); new Object[] {mailSubject, mailBody, originalCommentEmail});
mailService.send(message); mailService.send(message);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new EventException("Reply notifier error!"); throw new EventException("Reply notifier error!");
} }
} }
......
...@@ -18,12 +18,12 @@ package org.b3log.solo.event.ping; ...@@ -18,12 +18,12 @@ package org.b3log.solo.event.ping;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.urlfetch.HTTPRequest; import org.b3log.latke.urlfetch.HTTPRequest;
import org.b3log.latke.urlfetch.URLFetchService; import org.b3log.latke.urlfetch.URLFetchService;
import org.b3log.latke.urlfetch.URLFetchServiceFactory; import org.b3log.latke.urlfetch.URLFetchServiceFactory;
...@@ -96,7 +96,7 @@ public final class AddArticleGoogleBlogSearchPinger extends AbstractEventListene ...@@ -96,7 +96,7 @@ public final class AddArticleGoogleBlogSearchPinger extends AbstractEventListene
final String spec = "http://blogsearch.google.com/ping?name=" + URLEncoder.encode(blogTitle, "UTF-8") + "&url=" final String spec = "http://blogsearch.google.com/ping?name=" + URLEncoder.encode(blogTitle, "UTF-8") + "&url="
+ URLEncoder.encode(Latkes.getServePath(), "UTF-8") + "&changesURL=" + URLEncoder.encode(articlePermalink, "UTF-8"); + URLEncoder.encode(Latkes.getServePath(), "UTF-8") + "&changesURL=" + URLEncoder.encode(articlePermalink, "UTF-8");
LOGGER.log(Level.FINER, "Request Google Blog Search Service API[{0}] while adding an " + "article[title=" + articleTitle + "]", LOGGER.log(Level.DEBUG, "Request Google Blog Search Service API[{0}] while adding an " + "article[title=" + articleTitle + "]",
spec); spec);
final HTTPRequest request = new HTTPRequest(); final HTTPRequest request = new HTTPRequest();
...@@ -104,7 +104,7 @@ public final class AddArticleGoogleBlogSearchPinger extends AbstractEventListene ...@@ -104,7 +104,7 @@ public final class AddArticleGoogleBlogSearchPinger extends AbstractEventListene
URL_FETCH_SERVICE.fetchAsync(request); URL_FETCH_SERVICE.fetchAsync(request);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Ping Google Blog Search Service fail while adding an article[title=" + articleTitle + "]", e); LOGGER.log(Level.ERROR, "Ping Google Blog Search Service fail while adding an article[title=" + articleTitle + "]", e);
} }
} }
} }
...@@ -18,12 +18,12 @@ package org.b3log.solo.event.ping; ...@@ -18,12 +18,12 @@ package org.b3log.solo.event.ping;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.urlfetch.HTTPRequest; import org.b3log.latke.urlfetch.HTTPRequest;
import org.b3log.latke.urlfetch.URLFetchService; import org.b3log.latke.urlfetch.URLFetchService;
import org.b3log.latke.urlfetch.URLFetchServiceFactory; import org.b3log.latke.urlfetch.URLFetchServiceFactory;
...@@ -96,14 +96,14 @@ public final class UpdateArticleGoogleBlogSearchPinger extends AbstractEventList ...@@ -96,14 +96,14 @@ public final class UpdateArticleGoogleBlogSearchPinger extends AbstractEventList
final String spec = "http://blogsearch.google.com/ping?name=" + URLEncoder.encode(blogTitle, "UTF-8") + "&url=" final String spec = "http://blogsearch.google.com/ping?name=" + URLEncoder.encode(blogTitle, "UTF-8") + "&url="
+ URLEncoder.encode(Latkes.getServePath(), "UTF-8") + "&changesURL=" + URLEncoder.encode(articlePermalink, "UTF-8"); + URLEncoder.encode(Latkes.getServePath(), "UTF-8") + "&changesURL=" + URLEncoder.encode(articlePermalink, "UTF-8");
LOGGER.log(Level.FINER, LOGGER.log(Level.DEBUG,
"Request Google Blog Search Service API[{0}] while updateing " + "an article[title=" + articleTitle + "]", spec); "Request Google Blog Search Service API[{0}] while updateing " + "an article[title=" + articleTitle + "]", spec);
final HTTPRequest request = new HTTPRequest(); final HTTPRequest request = new HTTPRequest();
request.setURL(new URL(spec)); request.setURL(new URL(spec));
URL_FETCH_SERVICE.fetchAsync(request); URL_FETCH_SERVICE.fetchAsync(request);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Ping Google Blog Search Service fail while updating an " + "article[title=" + articleTitle + "]", e); LOGGER.log(Level.ERROR, "Ping Google Blog Search Service fail while updating an " + "article[title=" + articleTitle + "]", e);
} }
} }
} }
...@@ -17,11 +17,11 @@ package org.b3log.solo.event.plugin; ...@@ -17,11 +17,11 @@ package org.b3log.solo.event.plugin;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.plugin.AbstractPlugin; import org.b3log.latke.plugin.AbstractPlugin;
import org.b3log.latke.plugin.PluginManager; import org.b3log.latke.plugin.PluginManager;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
...@@ -54,7 +54,7 @@ public final class PluginRefresher extends AbstractEventListener<List<AbstractPl ...@@ -54,7 +54,7 @@ public final class PluginRefresher extends AbstractEventListener<List<AbstractPl
EventException { EventException {
final List<AbstractPlugin> plugins = event.getData(); final List<AbstractPlugin> plugins = event.getData();
LOGGER.log(Level.FINER, "Processing an event[type={0}, data={1}] in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
new Object[] {event.getType(), plugins, PluginRefresher.class.getName()}); new Object[] {event.getType(), plugins, PluginRefresher.class.getName()});
final Transaction transaction = pluginRepository.beginTransaction(); final Transaction transaction = pluginRepository.beginTransaction();
...@@ -68,7 +68,7 @@ public final class PluginRefresher extends AbstractEventListener<List<AbstractPl ...@@ -68,7 +68,7 @@ public final class PluginRefresher extends AbstractEventListener<List<AbstractPl
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Processing plugin loaded event error", e); LOGGER.log(Level.ERROR, "Processing plugin loaded event error", e);
throw new EventException(e); throw new EventException(e);
} }
} }
......
...@@ -19,13 +19,13 @@ package org.b3log.solo.event.rhythm; ...@@ -19,13 +19,13 @@ package org.b3log.solo.event.rhythm;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.Date; import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.urlfetch.HTTPRequest; import org.b3log.latke.urlfetch.HTTPRequest;
import org.b3log.latke.urlfetch.URLFetchService; import org.b3log.latke.urlfetch.URLFetchService;
...@@ -77,7 +77,7 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> { ...@@ -77,7 +77,7 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> {
try { try {
ADD_ARTICLE_URL = new URL(SoloServletListener.B3LOG_RHYTHM_SERVE_PATH + "/article"); ADD_ARTICLE_URL = new URL(SoloServletListener.B3LOG_RHYTHM_SERVE_PATH + "/article");
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
LOGGER.log(Level.SEVERE, "Creates remote service address[rhythm add article] error!"); LOGGER.log(Level.ERROR, "Creates remote service address[rhythm add article] error!");
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
...@@ -86,13 +86,13 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> { ...@@ -86,13 +86,13 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> {
public void action(final Event<JSONObject> event) throws EventException { public void action(final Event<JSONObject> event) throws EventException {
final JSONObject data = event.getData(); final JSONObject data = event.getData();
LOGGER.log(Level.FINER, "Processing an event[type={0}, data={1}] in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
new Object[] {event.getType(), data, ArticleSender.class.getName()}); new Object[] {event.getType(), data, ArticleSender.class.getName()});
try { try {
final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE); final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE);
if (!originalArticle.getBoolean(Article.ARTICLE_IS_PUBLISHED)) { if (!originalArticle.getBoolean(Article.ARTICLE_IS_PUBLISHED)) {
LOGGER.log(Level.FINER, "Ignores post article[title={0}] to Rhythm", originalArticle.getString(Article.ARTICLE_TITLE)); LOGGER.log(Level.DEBUG, "Ignores post article[title={0}] to Rhythm", originalArticle.getString(Article.ARTICLE_TITLE));
return; return;
} }
...@@ -141,10 +141,10 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> { ...@@ -141,10 +141,10 @@ public final class ArticleSender extends AbstractEventListener<JSONObject> {
urlFetchService.fetchAsync(httpRequest); urlFetchService.fetchAsync(httpRequest);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Sends an article to Rhythm error: {0}", e.getMessage()); LOGGER.log(Level.ERROR, "Sends an article to Rhythm error: {0}", e.getMessage());
} }
LOGGER.log(Level.FINER, "Sent an article to Rhythm"); LOGGER.log(Level.DEBUG, "Sent an article to Rhythm");
} }
/** /**
......
...@@ -19,13 +19,13 @@ package org.b3log.solo.event.rhythm; ...@@ -19,13 +19,13 @@ package org.b3log.solo.event.rhythm;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.Date; import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.urlfetch.HTTPRequest; import org.b3log.latke.urlfetch.HTTPRequest;
import org.b3log.latke.urlfetch.URLFetchService; import org.b3log.latke.urlfetch.URLFetchService;
...@@ -76,7 +76,7 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> { ...@@ -76,7 +76,7 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> {
try { try {
UPDATE_ARTICLE_URL = new URL(SoloServletListener.B3LOG_RHYTHM_SERVE_PATH + "/article"); UPDATE_ARTICLE_URL = new URL(SoloServletListener.B3LOG_RHYTHM_SERVE_PATH + "/article");
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
LOGGER.log(Level.SEVERE, "Creates remote service address[rhythm update article] error!"); LOGGER.log(Level.ERROR, "Creates remote service address[rhythm update article] error!");
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
...@@ -85,13 +85,13 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> { ...@@ -85,13 +85,13 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> {
public void action(final Event<JSONObject> event) throws EventException { public void action(final Event<JSONObject> event) throws EventException {
final JSONObject data = event.getData(); final JSONObject data = event.getData();
LOGGER.log(Level.FINER, "Processing an event[type={0}, data={1}] in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
new Object[] {event.getType(), data, ArticleUpdater.class.getName()}); new Object[] {event.getType(), data, ArticleUpdater.class.getName()});
try { try {
final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE); final JSONObject originalArticle = data.getJSONObject(Article.ARTICLE);
if (!originalArticle.getBoolean(Article.ARTICLE_IS_PUBLISHED)) { if (!originalArticle.getBoolean(Article.ARTICLE_IS_PUBLISHED)) {
LOGGER.log(Level.FINER, "Ignores post article[title={0}] to Rhythm", originalArticle.getString(Article.ARTICLE_TITLE)); LOGGER.log(Level.DEBUG, "Ignores post article[title={0}] to Rhythm", originalArticle.getString(Article.ARTICLE_TITLE));
return; return;
} }
...@@ -140,10 +140,10 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> { ...@@ -140,10 +140,10 @@ public final class ArticleUpdater extends AbstractEventListener<JSONObject> {
urlFetchService.fetchAsync(httpRequest); urlFetchService.fetchAsync(httpRequest);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Sends an article to Rhythm error: {0}", e.getMessage()); LOGGER.log(Level.ERROR, "Sends an article to Rhythm error: {0}", e.getMessage());
} }
LOGGER.log(Level.FINER, "Sent an article to Rhythm"); LOGGER.log(Level.DEBUG, "Sent an article to Rhythm");
} }
/** /**
......
...@@ -18,13 +18,13 @@ package org.b3log.solo.event.symphony; ...@@ -18,13 +18,13 @@ package org.b3log.solo.event.symphony;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.AbstractEventListener; import org.b3log.latke.event.AbstractEventListener;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.urlfetch.HTTPRequest; import org.b3log.latke.urlfetch.HTTPRequest;
import org.b3log.latke.urlfetch.URLFetchService; import org.b3log.latke.urlfetch.URLFetchService;
...@@ -71,7 +71,7 @@ public final class CommentSender extends AbstractEventListener<JSONObject> { ...@@ -71,7 +71,7 @@ public final class CommentSender extends AbstractEventListener<JSONObject> {
try { try {
ADD_COMMENT_URL = new URL(SoloServletListener.B3LOG_SYMPHONY_SERVE_PATH + "/solo/comment"); ADD_COMMENT_URL = new URL(SoloServletListener.B3LOG_SYMPHONY_SERVE_PATH + "/solo/comment");
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
LOGGER.log(Level.SEVERE, "Creates remote service address[symphony add comment] error!"); LOGGER.log(Level.ERROR, "Creates remote service address[symphony add comment] error!");
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
...@@ -80,7 +80,7 @@ public final class CommentSender extends AbstractEventListener<JSONObject> { ...@@ -80,7 +80,7 @@ public final class CommentSender extends AbstractEventListener<JSONObject> {
public void action(final Event<JSONObject> event) throws EventException { public void action(final Event<JSONObject> event) throws EventException {
final JSONObject data = event.getData(); final JSONObject data = event.getData();
LOGGER.log(Level.FINER, "Processing an event[type={0}, data={1}] in listener[className={2}]", LOGGER.log(Level.DEBUG, "Processing an event[type={0}, data={1}] in listener[className={2}]",
new Object[] {event.getType(), data, ArticleSender.class.getName()}); new Object[] {event.getType(), data, ArticleSender.class.getName()});
try { try {
final JSONObject originalComment = data.getJSONObject(Comment.COMMENT); final JSONObject originalComment = data.getJSONObject(Comment.COMMENT);
...@@ -122,10 +122,10 @@ public final class CommentSender extends AbstractEventListener<JSONObject> { ...@@ -122,10 +122,10 @@ public final class CommentSender extends AbstractEventListener<JSONObject> {
urlFetchService.fetchAsync(httpRequest); urlFetchService.fetchAsync(httpRequest);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Sends a comment to Symphony error: {0}", e.getMessage()); LOGGER.log(Level.ERROR, "Sends a comment to Symphony error: {0}", e.getMessage());
} }
LOGGER.log(Level.FINER, "Sent a comment to Symphony"); LOGGER.log(Level.DEBUG, "Sent a comment to Symphony");
} }
/** /**
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.b3log.solo.filter; package org.b3log.solo.filter;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.io.IOException; import java.io.IOException;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
...@@ -27,6 +25,8 @@ import javax.servlet.ServletRequest; ...@@ -27,6 +25,8 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.user.GeneralUser; import org.b3log.latke.user.GeneralUser;
import org.b3log.latke.user.UserService; import org.b3log.latke.user.UserService;
import org.b3log.latke.user.UserServiceFactory; import org.b3log.latke.user.UserServiceFactory;
...@@ -85,7 +85,7 @@ public final class AuthFilter implements Filter { ...@@ -85,7 +85,7 @@ public final class AuthFilter implements Filter {
final GeneralUser currentUser = userService.getCurrentUser(httpServletRequest); final GeneralUser currentUser = userService.getCurrentUser(httpServletRequest);
if (null == currentUser) { if (null == currentUser) {
LOGGER.warning("The request has been forbidden"); LOGGER.warn("The request has been forbidden");
httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN); httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
return; return;
...@@ -93,14 +93,14 @@ public final class AuthFilter implements Filter { ...@@ -93,14 +93,14 @@ public final class AuthFilter implements Filter {
final String currentUserEmail = currentUser.getEmail(); final String currentUserEmail = currentUser.getEmail();
LOGGER.log(Level.FINER, "Current user email[{0}]", currentUserEmail); LOGGER.log(Level.DEBUG, "Current user email[{0}]", currentUserEmail);
if (users.isSoloUser(currentUserEmail)) { if (users.isSoloUser(currentUserEmail)) {
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;
} }
LOGGER.warning("The request has been forbidden"); LOGGER.warn("The request has been forbidden");
httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN); httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
} catch (final Exception e) { } catch (final Exception e) {
httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND); httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
......
...@@ -17,8 +17,6 @@ package org.b3log.solo.filter; ...@@ -17,8 +17,6 @@ package org.b3log.solo.filter;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
...@@ -29,6 +27,8 @@ import javax.servlet.http.HttpServletRequest; ...@@ -29,6 +27,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestDispatcher; import org.b3log.latke.servlet.HTTPRequestDispatcher;
...@@ -75,7 +75,7 @@ public final class InitCheckFilter implements Filter { ...@@ -75,7 +75,7 @@ public final class InitCheckFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request; final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
final String requestURI = httpServletRequest.getRequestURI(); final String requestURI = httpServletRequest.getRequestURI();
LOGGER.log(Level.FINEST, "Request[URI={0}]", requestURI); LOGGER.log(Level.TRACE, "Request[URI={0}]", requestURI);
if (requestURI.startsWith("/latke/remote")) { if (requestURI.startsWith("/latke/remote")) {
// If requests Latke Remote APIs, skips this filter // If requests Latke Remote APIs, skips this filter
...@@ -98,11 +98,11 @@ public final class InitCheckFilter implements Filter { ...@@ -98,11 +98,11 @@ public final class InitCheckFilter implements Filter {
return; return;
} }
LOGGER.finer("Try to get preference to confirm whether the preference exixts"); LOGGER.debug("Try to get preference to confirm whether the preference exixts");
final JSONObject preference = preferenceQueryService.getPreference(); final JSONObject preference = preferenceQueryService.getPreference();
if (null == preference) { if (null == preference) {
LOGGER.log(Level.WARNING, "B3log Solo has not been initialized, so redirects to /init"); LOGGER.log(Level.WARN, "B3log Solo has not been initialized, so redirects to /init");
final HTTPRequestContext context = new HTTPRequestContext(); final HTTPRequestContext context = new HTTPRequestContext();
......
...@@ -18,8 +18,6 @@ package org.b3log.solo.filter; ...@@ -18,8 +18,6 @@ package org.b3log.solo.filter;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
...@@ -32,6 +30,8 @@ import org.apache.commons.lang.time.DateFormatUtils; ...@@ -32,6 +30,8 @@ import org.apache.commons.lang.time.DateFormatUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -105,19 +105,19 @@ public final class PageCacheFilter implements Filter { ...@@ -105,19 +105,19 @@ public final class PageCacheFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request; final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
final String requestURI = httpServletRequest.getRequestURI(); final String requestURI = httpServletRequest.getRequestURI();
LOGGER.log(Level.FINER, "Request URI[{0}]", requestURI); LOGGER.log(Level.DEBUG, "Request URI[{0}]", requestURI);
if (StaticResources.isStatic(httpServletRequest)) { if (StaticResources.isStatic(httpServletRequest)) {
final String path = httpServletRequest.getServletPath() + httpServletRequest.getPathInfo(); final String path = httpServletRequest.getServletPath() + httpServletRequest.getPathInfo();
LOGGER.log(Level.FINEST, "Requests a static resource, forwards to servlet[path={0}]", path); LOGGER.log(Level.TRACE, "Requests a static resource, forwards to servlet[path={0}]", path);
request.getRequestDispatcher(path).forward(request, response); request.getRequestDispatcher(path).forward(request, response);
return; return;
} }
if (!Latkes.isPageCacheEnabled()) { if (!Latkes.isPageCacheEnabled()) {
LOGGER.log(Level.FINEST, "Page cache is disabled"); LOGGER.log(Level.TRACE, "Page cache is disabled");
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;
...@@ -144,7 +144,7 @@ public final class PageCacheFilter implements Filter { ...@@ -144,7 +144,7 @@ public final class PageCacheFilter implements Filter {
final JSONObject cachedPageContentObject = PageCaches.get(pageCacheKey, httpServletRequest, (HttpServletResponse) response); final JSONObject cachedPageContentObject = PageCaches.get(pageCacheKey, httpServletRequest, (HttpServletResponse) response);
if (null == cachedPageContentObject) { if (null == cachedPageContentObject) {
LOGGER.log(Level.FINER, "Page cache miss for request URI[{0}]", requestURI); LOGGER.log(Level.DEBUG, "Page cache miss for request URI[{0}]", requestURI);
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;
...@@ -179,12 +179,12 @@ public final class PageCacheFilter implements Filter { ...@@ -179,12 +179,12 @@ public final class PageCacheFilter implements Filter {
} }
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
chain.doFilter(request, response); chain.doFilter(request, response);
} }
try { try {
LOGGER.log(Level.FINEST, "Writes resposne for page[pageCacheKey={0}] from cache", pageCacheKey); LOGGER.log(Level.TRACE, "Writes resposne for page[pageCacheKey={0}] from cache", pageCacheKey);
response.setContentType("text/html"); response.setContentType("text/html");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
final PrintWriter writer = response.getWriter(); final PrintWriter writer = response.getWriter();
...@@ -195,7 +195,7 @@ public final class PageCacheFilter implements Filter { ...@@ -195,7 +195,7 @@ public final class PageCacheFilter implements Filter {
final String cachedTitle = cachedPageContentObject.getString(PageCaches.CACHED_TITLE); final String cachedTitle = cachedPageContentObject.getString(PageCaches.CACHED_TITLE);
LOGGER.log(Level.FINEST, "Cached value[key={0}, type={1}, title={2}]", new Object[] {pageCacheKey, cachedType, cachedTitle}); LOGGER.log(Level.TRACE, "Cached value[key={0}, type={1}, title={2}]", new Object[] {pageCacheKey, cachedType, cachedTitle});
statistics.incBlogViewCount((HttpServletRequest) request, (HttpServletResponse) response); statistics.incBlogViewCount((HttpServletRequest) request, (HttpServletResponse) response);
...@@ -203,19 +203,19 @@ public final class PageCacheFilter implements Filter { ...@@ -203,19 +203,19 @@ public final class PageCacheFilter implements Filter {
final String dateString = DateFormatUtils.format(endimeMillis, "yyyy/MM/dd HH:mm:ss"); final String dateString = DateFormatUtils.format(endimeMillis, "yyyy/MM/dd HH:mm:ss");
final String msg = String.format("<!-- Cached by B3log Solo(%1$d ms), %2$s -->", endimeMillis - startTimeMillis, dateString); final String msg = String.format("<!-- Cached by B3log Solo(%1$d ms), %2$s -->", endimeMillis - startTimeMillis, dateString);
LOGGER.finer(msg); LOGGER.debug(msg);
cachedPageContent += Strings.LINE_SEPARATOR + msg; cachedPageContent += Strings.LINE_SEPARATOR + msg;
writer.write(cachedPageContent); writer.write(cachedPageContent);
writer.flush(); writer.flush();
writer.close(); writer.close();
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
chain.doFilter(request, response); chain.doFilter(request, response);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
chain.doFilter(request, response); chain.doFilter(request, response);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
chain.doFilter(request, response); chain.doFilter(request, response);
} }
} }
......
...@@ -17,8 +17,6 @@ package org.b3log.solo.filter; ...@@ -17,8 +17,6 @@ package org.b3log.solo.filter;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
...@@ -30,6 +28,8 @@ import javax.servlet.http.HttpServletResponse; ...@@ -30,6 +28,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestDispatcher; import org.b3log.latke.servlet.HTTPRequestDispatcher;
...@@ -97,13 +97,13 @@ public final class PermalinkFilter implements Filter { ...@@ -97,13 +97,13 @@ public final class PermalinkFilter implements Filter {
final String requestURI = httpServletRequest.getRequestURI(); final String requestURI = httpServletRequest.getRequestURI();
LOGGER.log(Level.FINER, "Request URI[{0}]", requestURI); LOGGER.log(Level.DEBUG, "Request URI[{0}]", requestURI);
final String contextPath = Latkes.getContextPath(); final String contextPath = Latkes.getContextPath();
final String permalink = StringUtils.substringAfter(requestURI, contextPath); final String permalink = StringUtils.substringAfter(requestURI, contextPath);
if (Permalinks.invalidPermalinkFormat(permalink)) { if (Permalinks.invalidPermalinkFormat(permalink)) {
LOGGER.log(Level.FINER, "Skip filter request[URI={0}]", permalink); LOGGER.log(Level.DEBUG, "Skip filter request[URI={0}]", permalink);
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;
...@@ -118,14 +118,14 @@ public final class PermalinkFilter implements Filter { ...@@ -118,14 +118,14 @@ public final class PermalinkFilter implements Filter {
page = pageRepository.getByPermalink(permalink); page = pageRepository.getByPermalink(permalink);
} }
if (null == page && null == article) { if (null == page) {
LOGGER.log(Level.FINER, "Not found article/page with permalink[{0}]", permalink); LOGGER.log(Level.DEBUG, "Not found article/page with permalink[{0}]", permalink);
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;
} }
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Processes article permalink filter failed", e); LOGGER.log(Level.ERROR, "Processes article permalink filter failed", e);
httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND); httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
return; return;
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
package org.b3log.solo.model; package org.b3log.solo.model;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeEnv; import org.b3log.latke.RuntimeEnv;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -429,7 +429,7 @@ public final class Preference { ...@@ -429,7 +429,7 @@ public final class Preference {
DEFAULT_PAGE_CACHE_ENABLED = true; DEFAULT_PAGE_CACHE_ENABLED = true;
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Creates sign error!", e); LOGGER.log(Level.ERROR, "Creates sign error!", e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
......
...@@ -19,12 +19,12 @@ package org.b3log.solo.plugin.broadcast; ...@@ -19,12 +19,12 @@ package org.b3log.solo.plugin.broadcast;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
...@@ -91,7 +91,7 @@ public final class ChanceProcessor { ...@@ -91,7 +91,7 @@ public final class ChanceProcessor {
try { try {
ADD_BROADCAST_URL = new URL(SoloServletListener.B3LOG_RHYTHM_SERVE_PATH + "/broadcast"); ADD_BROADCAST_URL = new URL(SoloServletListener.B3LOG_RHYTHM_SERVE_PATH + "/broadcast");
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
LOGGER.log(Level.SEVERE, "Creates remote service address[rhythm add broadcast] error!"); LOGGER.log(Level.ERROR, "Creates remote service address[rhythm add broadcast] error!");
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
...@@ -150,7 +150,7 @@ public final class ChanceProcessor { ...@@ -150,7 +150,7 @@ public final class ChanceProcessor {
} catch (final Exception e) { } catch (final Exception e) {
final String msg = "Broadcast plugin exception"; final String msg = "Broadcast plugin exception";
LOGGER.log(Level.SEVERE, msg, e); LOGGER.log(Level.ERROR, msg, e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -220,7 +220,7 @@ public final class ChanceProcessor { ...@@ -220,7 +220,7 @@ public final class ChanceProcessor {
ret.put(Option.ID_C_BROADCAST_CHANCE_EXPIRATION_TIME, option.getLong(Option.OPTION_VALUE)); ret.put(Option.ID_C_BROADCAST_CHANCE_EXPIRATION_TIME, option.getLong(Option.OPTION_VALUE));
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Broadcast plugin exception", e); LOGGER.log(Level.ERROR, "Broadcast plugin exception", e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -317,7 +317,7 @@ public final class ChanceProcessor { ...@@ -317,7 +317,7 @@ public final class ChanceProcessor {
ret.put(Keys.STATUS_CODE, false); ret.put(Keys.STATUS_CODE, false);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Submits broadcast failed", e); LOGGER.log(Level.ERROR, "Submits broadcast failed", e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -19,8 +19,6 @@ package org.b3log.solo.plugin.cache; ...@@ -19,8 +19,6 @@ package org.b3log.solo.plugin.cache;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
...@@ -29,6 +27,8 @@ import org.b3log.latke.model.Pagination; ...@@ -29,6 +27,8 @@ import org.b3log.latke.model.Pagination;
import org.b3log.solo.model.Page; import org.b3log.solo.model.Page;
import org.b3log.solo.util.Users; import org.b3log.solo.util.Users;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
...@@ -122,7 +122,7 @@ public final class AdminCacheService { ...@@ -122,7 +122,7 @@ public final class AdminCacheService {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -212,7 +212,7 @@ public final class AdminCacheService { ...@@ -212,7 +212,7 @@ public final class AdminCacheService {
final List<JSONObject> pages = new ArrayList<JSONObject>(); final List<JSONObject> pages = new ArrayList<JSONObject>();
for (final String key : keys) { for (final String key : keys) {
LOGGER.log(Level.FINER, "Cached page[key={0}]", key); LOGGER.log(Level.DEBUG, "Cached page[key={0}]", key);
JSONObject cachedPage = PageCaches.get(key); JSONObject cachedPage = PageCaches.get(key);
...@@ -228,7 +228,7 @@ public final class AdminCacheService { ...@@ -228,7 +228,7 @@ public final class AdminCacheService {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -286,7 +286,7 @@ public final class AdminCacheService { ...@@ -286,7 +286,7 @@ public final class AdminCacheService {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Sets page cache error: {0}", e.getMessage()); LOGGER.log(Level.ERROR, "Sets page cache error: {0}", e.getMessage());
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -17,11 +17,11 @@ package org.b3log.solo.processor; ...@@ -17,11 +17,11 @@ package org.b3log.solo.processor;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
...@@ -86,7 +86,7 @@ public final class CacheProcessor { ...@@ -86,7 +86,7 @@ public final class CacheProcessor {
context.setRenderer(new DoNothingRenderer()); context.setRenderer(new DoNothingRenderer());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} }
......
...@@ -24,8 +24,6 @@ import java.io.OutputStream; ...@@ -24,8 +24,6 @@ import java.io.OutputStream;
import java.net.URL; import java.net.URL;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Random; import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -37,6 +35,8 @@ import org.b3log.latke.RuntimeEnv; ...@@ -37,6 +35,8 @@ import org.b3log.latke.RuntimeEnv;
import org.b3log.latke.image.Image; import org.b3log.latke.image.Image;
import org.b3log.latke.image.ImageService; import org.b3log.latke.image.ImageService;
import org.b3log.latke.image.ImageServiceFactory; import org.b3log.latke.image.ImageServiceFactory;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
...@@ -112,7 +112,7 @@ public final class CaptchaProcessor { ...@@ -112,7 +112,7 @@ public final class CaptchaProcessor {
final HttpSession httpSession = request.getSession(false); final HttpSession httpSession = request.getSession(false);
if (null != httpSession) { if (null != httpSession) {
LOGGER.log(Level.FINER, "Captcha[{0}] for session[id={1}]", new Object[] {captcha, httpSession.getId()}); LOGGER.log(Level.DEBUG, "Captcha[{0}] for session[id={1}]", new Object[] {captcha, httpSession.getId()});
httpSession.setAttribute(CAPTCHA, captcha); httpSession.setAttribute(CAPTCHA, captcha);
} }
...@@ -122,7 +122,7 @@ public final class CaptchaProcessor { ...@@ -122,7 +122,7 @@ public final class CaptchaProcessor {
renderer.setImage(captchaImg); renderer.setImage(captchaImg);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} }
...@@ -177,7 +177,7 @@ public final class CaptchaProcessor { ...@@ -177,7 +177,7 @@ public final class CaptchaProcessor {
zipFile.close(); zipFile.close();
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.severe("Can not load captchs!"); LOGGER.error("Can not load captchs!");
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
......
...@@ -17,13 +17,13 @@ package org.b3log.solo.processor; ...@@ -17,13 +17,13 @@ package org.b3log.solo.processor;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -113,7 +113,7 @@ public final class CommentProcessor { ...@@ -113,7 +113,7 @@ public final class CommentProcessor {
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
if (!jsonObject.optBoolean(Keys.STATUS_CODE)) { if (!jsonObject.optBoolean(Keys.STATUS_CODE)) {
LOGGER.log(Level.WARNING, "Can't add comment[msg={0}]", jsonObject.optString(Keys.MSG)); LOGGER.log(Level.WARN, "Can't add comment[msg={0}]", jsonObject.optString(Keys.MSG));
return; return;
} }
...@@ -150,7 +150,7 @@ public final class CommentProcessor { ...@@ -150,7 +150,7 @@ public final class CommentProcessor {
renderer.setJSONObject(addResult); renderer.setJSONObject(addResult);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Can not add comment on page", e); LOGGER.log(Level.ERROR, "Can not add comment on page", e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("addFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("addFailLabel"));
...@@ -205,7 +205,7 @@ public final class CommentProcessor { ...@@ -205,7 +205,7 @@ public final class CommentProcessor {
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
if (!jsonObject.optBoolean(Keys.STATUS_CODE)) { if (!jsonObject.optBoolean(Keys.STATUS_CODE)) {
LOGGER.log(Level.WARNING, "Can't add comment[msg={0}]", jsonObject.optString(Keys.MSG)); LOGGER.log(Level.WARN, "Can't add comment[msg={0}]", jsonObject.optString(Keys.MSG));
return; return;
} }
...@@ -242,7 +242,7 @@ public final class CommentProcessor { ...@@ -242,7 +242,7 @@ public final class CommentProcessor {
renderer.setJSONObject(addResult); renderer.setJSONObject(addResult);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Can not add comment on article", e); LOGGER.log(Level.ERROR, "Can not add comment on article", e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("addFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("addFailLabel"));
} }
......
...@@ -19,11 +19,11 @@ package org.b3log.solo.processor; ...@@ -19,11 +19,11 @@ package org.b3log.solo.processor;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -89,7 +89,7 @@ public final class ErrorProcessor { ...@@ -89,7 +89,7 @@ public final class ErrorProcessor {
String templateName = StringUtils.substringAfterLast(requestURI, "/"); String templateName = StringUtils.substringAfterLast(requestURI, "/");
templateName = StringUtils.substringBefore(templateName, ".") + ".ftl"; templateName = StringUtils.substringBefore(templateName, ".") + ".ftl";
LOGGER.log(Level.FINE, "Shows error page[requestURI={0}, templateName={1}]", new Object[] {requestURI, templateName}); LOGGER.log(Level.DEBUG, "Shows error page[requestURI={0}, templateName={1}]", new Object[] {requestURI, templateName});
final ConsoleRenderer renderer = new ConsoleRenderer(); final ConsoleRenderer renderer = new ConsoleRenderer();
...@@ -109,12 +109,12 @@ public final class ErrorProcessor { ...@@ -109,12 +109,12 @@ public final class ErrorProcessor {
dataModel.put(Common.LOGIN_URL, userService.createLoginURL(Common.ADMIN_INDEX_URI)); dataModel.put(Common.LOGIN_URL, userService.createLoginURL(Common.ADMIN_INDEX_URI));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
......
...@@ -20,13 +20,13 @@ import java.io.IOException; ...@@ -20,13 +20,13 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.CompositeFilter; import org.b3log.latke.repository.CompositeFilter;
import org.b3log.latke.repository.CompositeFilterOperator; import org.b3log.latke.repository.CompositeFilterOperator;
...@@ -194,7 +194,7 @@ public final class FeedProcessor { ...@@ -194,7 +194,7 @@ public final class FeedProcessor {
renderer.setContent(feed.toString()); renderer.setContent(feed.toString());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Get blog article feed error", e); LOGGER.log(Level.ERROR, "Get blog article feed error", e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
...@@ -329,7 +329,7 @@ public final class FeedProcessor { ...@@ -329,7 +329,7 @@ public final class FeedProcessor {
renderer.setContent(feed.toString()); renderer.setContent(feed.toString());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Get tag article feed error", e); LOGGER.log(Level.ERROR, "Get tag article feed error", e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
...@@ -440,7 +440,7 @@ public final class FeedProcessor { ...@@ -440,7 +440,7 @@ public final class FeedProcessor {
renderer.setContent(channel.toString()); renderer.setContent(channel.toString());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Get blog article rss error", e); LOGGER.log(Level.ERROR, "Get blog article rss error", e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
...@@ -582,7 +582,7 @@ public final class FeedProcessor { ...@@ -582,7 +582,7 @@ public final class FeedProcessor {
renderer.setContent(channel.toString()); renderer.setContent(channel.toString());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Get tag article rss error", e); LOGGER.log(Level.ERROR, "Get tag article rss error", e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
......
...@@ -21,14 +21,14 @@ import java.io.IOException; ...@@ -21,14 +21,14 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -136,12 +136,12 @@ public final class IndexProcessor { ...@@ -136,12 +136,12 @@ public final class IndexProcessor {
dataModel.put(Common.PATH, ""); dataModel.put(Common.PATH, "");
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
...@@ -179,12 +179,12 @@ public final class IndexProcessor { ...@@ -179,12 +179,12 @@ public final class IndexProcessor {
request.setAttribute(PageCaches.CACHED_TYPE, langs.get(PageTypes.KILL_BROWSER.getLangeLabel())); request.setAttribute(PageCaches.CACHED_TYPE, langs.get(PageTypes.KILL_BROWSER.getLangeLabel()));
request.setAttribute(PageCaches.CACHED_LINK, request.getRequestURI()); request.setAttribute(PageCaches.CACHED_LINK, request.getRequestURI());
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
...@@ -218,12 +218,12 @@ public final class IndexProcessor { ...@@ -218,12 +218,12 @@ public final class IndexProcessor {
Keys.fillServer(dataModel); Keys.fillServer(dataModel);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
...@@ -283,7 +283,7 @@ public final class IndexProcessor { ...@@ -283,7 +283,7 @@ public final class IndexProcessor {
try { try {
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.log(Level.SEVERE, "Can not sned error 500!", ex); LOGGER.log(Level.ERROR, "Can not sned error 500!", ex);
} }
} }
} }
......
...@@ -19,12 +19,12 @@ package org.b3log.solo.processor; ...@@ -19,12 +19,12 @@ package org.b3log.solo.processor;
import java.util.Calendar; import java.util.Calendar;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
...@@ -178,7 +178,7 @@ public final class InitProcessor { ...@@ -178,7 +178,7 @@ public final class InitProcessor {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
ret.put(Keys.MSG, e.getMessage()); ret.put(Keys.MSG, e.getMessage());
} }
......
...@@ -19,13 +19,13 @@ package org.b3log.solo.processor; ...@@ -19,13 +19,13 @@ package org.b3log.solo.processor;
import java.io.IOException; import java.io.IOException;
import java.util.Calendar; import java.util.Calendar;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.mail.MailService; import org.b3log.latke.mail.MailService;
import org.b3log.latke.mail.MailServiceFactory; import org.b3log.latke.mail.MailServiceFactory;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
...@@ -181,7 +181,7 @@ public final class LoginProcessor { ...@@ -181,7 +181,7 @@ public final class LoginProcessor {
final JSONObject user = userQueryService.getUserByEmail(userEmail); final JSONObject user = userQueryService.getUserByEmail(userEmail);
if (null == user) { if (null == user) {
LOGGER.log(Level.WARNING, "Not found user[email={0}]", userEmail); LOGGER.log(Level.WARN, "Not found user[email={0}]", userEmail);
return; return;
} }
...@@ -197,9 +197,9 @@ public final class LoginProcessor { ...@@ -197,9 +197,9 @@ public final class LoginProcessor {
return; return;
} }
LOGGER.log(Level.WARNING, "Wrong password[{0}]", userPwd); LOGGER.log(Level.WARN, "Wrong password[{0}]", userPwd);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} }
...@@ -275,7 +275,7 @@ public final class LoginProcessor { ...@@ -275,7 +275,7 @@ public final class LoginProcessor {
final String userEmail = requestJSONObject.getString(User.USER_EMAIL); final String userEmail = requestJSONObject.getString(User.USER_EMAIL);
if (Strings.isEmptyOrNull(userEmail)) { if (Strings.isEmptyOrNull(userEmail)) {
LOGGER.log(Level.WARNING, "Why user's email is empty"); LOGGER.log(Level.WARN, "Why user's email is empty");
return; return;
} }
...@@ -284,20 +284,20 @@ public final class LoginProcessor { ...@@ -284,20 +284,20 @@ public final class LoginProcessor {
final JSONObject user = userQueryService.getUserByEmail(userEmail); final JSONObject user = userQueryService.getUserByEmail(userEmail);
if (null == user) { if (null == user) {
LOGGER.log(Level.WARNING, "Not found user[email={0}]", userEmail); LOGGER.log(Level.WARN, "Not found user[email={0}]", userEmail);
jsonObject.put(Keys.MSG, langPropsService.get("userEmailNotFoundMsg")); jsonObject.put(Keys.MSG, langPropsService.get("userEmailNotFoundMsg"));
return; return;
} }
if (isPwdExpired()) { if (isPwdExpired()) {
LOGGER.log(Level.WARNING, "User[email={0}]'s random password has been expired", userEmail); LOGGER.log(Level.WARN, "User[email={0}]'s random password has been expired", userEmail);
jsonObject.put(Keys.MSG, langPropsService.get("userEmailNotFoundMsg")); jsonObject.put(Keys.MSG, langPropsService.get("userEmailNotFoundMsg"));
return; return;
} }
sendRandomPwd(user, userEmail, jsonObject); sendRandomPwd(user, userEmail, jsonObject);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} }
...@@ -341,11 +341,11 @@ public final class LoginProcessor { ...@@ -341,11 +341,11 @@ public final class LoginProcessor {
if (userPassword.equals(hashPassword)) { if (userPassword.equals(hashPassword)) {
Sessions.login(request, response, user); Sessions.login(request, response, user);
LOGGER.log(Level.FINER, "Logged in with cookie[email={0}]", userEmail); LOGGER.log(Level.DEBUG, "Logged in with cookie[email={0}]", userEmail);
} }
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.WARNING, "Parses cookie failed, clears the cookie[name=b3log-latke]", e); LOGGER.log(Level.WARN, "Parses cookie failed, clears the cookie[name=b3log-latke]", e);
final Cookie cookie = new Cookie("b3log-latke", null); final Cookie cookie = new Cookie("b3log-latke", null);
...@@ -399,7 +399,7 @@ public final class LoginProcessor { ...@@ -399,7 +399,7 @@ public final class LoginProcessor {
jsonObject.put("to", Latkes.getServePath() + "/login"); jsonObject.put("to", Latkes.getServePath() + "/login");
jsonObject.put(Keys.MSG, langPropsService.get("resetPwdSuccessMsg")); jsonObject.put(Keys.MSG, langPropsService.get("resetPwdSuccessMsg"));
LOGGER.log(Level.FINER, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]", new Object[] {mailSubject, mailBody, userEmail}); LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to [{2}]", new Object[] {mailSubject, mailBody, userEmail});
} }
/** /**
......
...@@ -19,13 +19,13 @@ package org.b3log.solo.processor; ...@@ -19,13 +19,13 @@ package org.b3log.solo.processor;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -156,12 +156,12 @@ public final class PageProcessor { ...@@ -156,12 +156,12 @@ public final class PageProcessor {
filler.fillBlogHeader(request, dataModel, preference); filler.fillBlogHeader(request, dataModel, preference);
filler.fillBlogFooter(dataModel, preference); filler.fillBlogFooter(dataModel, preference);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
......
...@@ -20,13 +20,13 @@ import java.io.IOException; ...@@ -20,13 +20,13 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.mail.MailService; import org.b3log.latke.mail.MailService;
import org.b3log.latke.mail.MailService.Message; import org.b3log.latke.mail.MailService.Message;
import org.b3log.latke.mail.MailServiceFactory; import org.b3log.latke.mail.MailServiceFactory;
...@@ -163,7 +163,7 @@ public final class RepairProcessor { ...@@ -163,7 +163,7 @@ public final class RepairProcessor {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent("Removes unused article properties failed, error msg[" + e.getMessage() + "]"); renderer.setContent("Removes unused article properties failed, error msg[" + e.getMessage() + "]");
} }
} }
...@@ -212,7 +212,7 @@ public final class RepairProcessor { ...@@ -212,7 +212,7 @@ public final class RepairProcessor {
renderer.setContent("Restores statistic succeeded."); renderer.setContent("Restores statistic succeeded.");
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent("Restores statistics failed, error msg[" + e.getMessage() + "]"); renderer.setContent("Restores statistics failed, error msg[" + e.getMessage() + "]");
} }
} }
...@@ -247,7 +247,7 @@ public final class RepairProcessor { ...@@ -247,7 +247,7 @@ public final class RepairProcessor {
MAIL_SVC.send(msg); MAIL_SVC.send(msg);
renderer.setContent("Restores signs succeeded."); renderer.setContent("Restores signs succeeded.");
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent("Restores signs failed, error msg[" + e.getMessage() + "]"); renderer.setContent("Restores signs failed, error msg[" + e.getMessage() + "]");
} }
} }
...@@ -305,7 +305,7 @@ public final class RepairProcessor { ...@@ -305,7 +305,7 @@ public final class RepairProcessor {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent("Repairs failed, error msg[" + e.getMessage() + "]"); renderer.setContent("Repairs failed, error msg[" + e.getMessage() + "]");
} }
} }
...@@ -339,7 +339,7 @@ public final class RepairProcessor { ...@@ -339,7 +339,7 @@ public final class RepairProcessor {
renderer.setContent(htmlBuilder.toString()); renderer.setContent(htmlBuilder.toString());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
...@@ -378,8 +378,7 @@ public final class RepairProcessor { ...@@ -378,8 +378,7 @@ public final class RepairProcessor {
succeed = true; succeed = true;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.WARN, "Removed partial data only", e);
LOGGER.log(Level.WARNING, "Removed partial data only");
} }
final StringBuilder htmlBuilder = new StringBuilder(); final StringBuilder htmlBuilder = new StringBuilder();
...@@ -399,7 +398,7 @@ public final class RepairProcessor { ...@@ -399,7 +398,7 @@ public final class RepairProcessor {
renderer.setContent(htmlBuilder.toString()); renderer.setContent(htmlBuilder.toString());
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
} catch (final IOException ex) { } catch (final IOException ex) {
...@@ -443,7 +442,7 @@ public final class RepairProcessor { ...@@ -443,7 +442,7 @@ public final class RepairProcessor {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes all data in repository[name=" + repository.getName() + "] failed", e); LOGGER.log(Level.ERROR, "Removes all data in repository[name=" + repository.getName() + "] failed", e);
} }
} }
} }
...@@ -19,12 +19,12 @@ package org.b3log.solo.processor; ...@@ -19,12 +19,12 @@ package org.b3log.solo.processor;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.Date; import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.FilterOperator; import org.b3log.latke.repository.FilterOperator;
import org.b3log.latke.repository.PropertyFilter; import org.b3log.latke.repository.PropertyFilter;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
...@@ -117,7 +117,7 @@ public final class SitemapProcessor { ...@@ -117,7 +117,7 @@ public final class SitemapProcessor {
LOGGER.log(Level.INFO, "Generated sitemap"); LOGGER.log(Level.INFO, "Generated sitemap");
renderer.setContent(content); renderer.setContent(content);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Get blog article feed error", e); LOGGER.log(Level.ERROR, "Get blog article feed error", e);
try { try {
context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); context.getResponse().sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
package org.b3log.solo.processor; package org.b3log.solo.processor;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -82,7 +82,7 @@ public final class StatProcessor { ...@@ -82,7 +82,7 @@ public final class StatProcessor {
try { try {
statisticMgmtService.flushStatistic(); statisticMgmtService.flushStatistic();
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, "Flushes statistic to repository failed", e); LOGGER.log(Level.ERROR, "Flushes statistic to repository failed", e);
} }
} }
} }
...@@ -22,13 +22,13 @@ import java.net.URLEncoder; ...@@ -22,13 +22,13 @@ import java.net.URLEncoder;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -142,7 +142,7 @@ public final class TagProcessor { ...@@ -142,7 +142,7 @@ public final class TagProcessor {
return; return;
} }
LOGGER.log(Level.FINER, "Tag[title={0}, currentPageNum={1}]", new Object[] {tagTitle, currentPageNum}); LOGGER.log(Level.DEBUG, "Tag[title={0}, currentPageNum={1}]", new Object[] {tagTitle, currentPageNum});
tagTitle = URLDecoder.decode(tagTitle, "UTF-8"); tagTitle = URLDecoder.decode(tagTitle, "UTF-8");
final JSONObject result = tagQueryService.getTagByTitle(tagTitle); final JSONObject result = tagQueryService.getTagByTitle(tagTitle);
...@@ -180,7 +180,7 @@ public final class TagProcessor { ...@@ -180,7 +180,7 @@ public final class TagProcessor {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
return; return;
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
...@@ -198,11 +198,11 @@ public final class TagProcessor { ...@@ -198,11 +198,11 @@ public final class TagProcessor {
final int tagArticleCount = tag.getInt(Tag.TAG_PUBLISHED_REFERENCE_COUNT); final int tagArticleCount = tag.getInt(Tag.TAG_PUBLISHED_REFERENCE_COUNT);
final int pageCount = (int) Math.ceil((double) tagArticleCount / (double) pageSize); final int pageCount = (int) Math.ceil((double) tagArticleCount / (double) pageSize);
LOGGER.log(Level.FINEST, "Paginate tag-articles[currentPageNum={0}, pageSize={1}, pageCount={2}, windowSize={3}]", LOGGER.log(Level.TRACE, "Paginate tag-articles[currentPageNum={0}, pageSize={1}, pageCount={2}, windowSize={3}]",
new Object[] {currentPageNum, pageSize, pageCount, windowSize}); new Object[] {currentPageNum, pageSize, pageCount, windowSize});
final List<Integer> pageNums = Paginator.paginate(currentPageNum, pageSize, pageCount, windowSize); final List<Integer> pageNums = Paginator.paginate(currentPageNum, pageSize, pageCount, windowSize);
LOGGER.log(Level.FINEST, "tag-articles[pageNums={0}]", pageNums); LOGGER.log(Level.TRACE, "tag-articles[pageNums={0}]", pageNums);
Collections.sort(articles, Comparators.ARTICLE_CREATE_DATE_COMPARATOR); Collections.sort(articles, Comparators.ARTICLE_CREATE_DATE_COMPARATOR);
...@@ -216,20 +216,20 @@ public final class TagProcessor { ...@@ -216,20 +216,20 @@ public final class TagProcessor {
filler.fillBlogHeader(request, dataModel, preference); filler.fillBlogHeader(request, dataModel, preference);
filler.fillBlogFooter(dataModel, preference); filler.fillBlogFooter(dataModel, preference);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
...@@ -310,13 +310,12 @@ public final class TagProcessor { ...@@ -310,13 +310,12 @@ public final class TagProcessor {
filler.fillBlogHeader(request, dataModel, preference); filler.fillBlogHeader(request, dataModel, preference);
filler.fillBlogFooter(dataModel, preference); filler.fillBlogFooter(dataModel, preference);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
......
...@@ -22,11 +22,11 @@ import java.sql.SQLException; ...@@ -22,11 +22,11 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeEnv; import org.b3log.latke.RuntimeEnv;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.mail.MailService; import org.b3log.latke.mail.MailService;
import org.b3log.latke.mail.MailServiceFactory; import org.b3log.latke.mail.MailServiceFactory;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
...@@ -143,7 +143,7 @@ public final class UpgradeProcessor { ...@@ -143,7 +143,7 @@ public final class UpgradeProcessor {
if ("0.5.6".equals(version)) { if ("0.5.6".equals(version)) {
v056ToV060(); v056ToV060();
} else { } else {
LOGGER.log(Level.WARNING, "Attempt to skip more than one version to upgrade. Expected: 0.5.6; Actually: {0}", version); LOGGER.log(Level.WARN, "Attempt to skip more than one version to upgrade. Expected: 0.5.6; Actually: {0}", version);
if (!sent) { if (!sent) {
notifyUserByEmail(); notifyUserByEmail();
sent = true; sent = true;
...@@ -151,7 +151,7 @@ public final class UpgradeProcessor { ...@@ -151,7 +151,7 @@ public final class UpgradeProcessor {
renderer.setContent(langPropsService.get("skipVersionAlert")); renderer.setContent(langPropsService.get("skipVersionAlert"));
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent( renderer.setContent(
"Upgrade failed [" + e.getMessage() + "], please contact the B3log Solo developers or reports this " "Upgrade failed [" + e.getMessage() + "], please contact the B3log Solo developers or reports this "
+ "issue directly (<a href='https://github.com/b3log/b3log-solo/issues/new'>" + "issue directly (<a href='https://github.com/b3log/b3log-solo/issues/new'>"
...@@ -197,7 +197,7 @@ public final class UpgradeProcessor { ...@@ -197,7 +197,7 @@ public final class UpgradeProcessor {
try { try {
JdbcFactory.createJdbcFactory().createTable(tableName, map.get(tableName)); JdbcFactory.createJdbcFactory().createTable(tableName, map.get(tableName));
} catch (final SQLException e) { } catch (final SQLException e) {
LOGGER.log(Level.SEVERE, "createTable[" + tableName + "] error", e); LOGGER.log(Level.ERROR, "createTable[" + tableName + "] error", e);
} }
} }
...@@ -212,13 +212,13 @@ public final class UpgradeProcessor { ...@@ -212,13 +212,13 @@ public final class UpgradeProcessor {
transaction.commit(); transaction.commit();
LOGGER.log(Level.FINEST, "Updated preference"); LOGGER.log(Level.TRACE, "Updated preference");
} catch (final Exception e) { } catch (final Exception e) {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Upgrade failed.", e); LOGGER.log(Level.ERROR, "Upgrade failed.", e);
throw new Exception("Upgrade failed from version 056 to version 060"); throw new Exception("Upgrade failed from version 056 to version 060");
} finally { } finally {
articleRepository.setCacheEnabled(true); articleRepository.setCacheEnabled(true);
...@@ -261,7 +261,7 @@ public final class UpgradeProcessor { ...@@ -261,7 +261,7 @@ public final class UpgradeProcessor {
final JSONArray articles = articleRepository.get(new Query()).getJSONArray(Keys.RESULTS); final JSONArray articles = articleRepository.get(new Query()).getJSONArray(Keys.RESULTS);
if (articles.length() <= 0) { if (articles.length() <= 0) {
LOGGER.log(Level.FINEST, "No articles"); LOGGER.log(Level.TRACE, "No articles");
return; return;
} }
...@@ -284,7 +284,7 @@ public final class UpgradeProcessor { ...@@ -284,7 +284,7 @@ public final class UpgradeProcessor {
if (0 == i % STEP) { if (0 == i % STEP) {
transaction.commit(); transaction.commit();
LOGGER.log(Level.FINEST, "Updated some articles"); LOGGER.log(Level.TRACE, "Updated some articles");
} }
} }
...@@ -292,7 +292,7 @@ public final class UpgradeProcessor { ...@@ -292,7 +292,7 @@ public final class UpgradeProcessor {
transaction.commit(); transaction.commit();
} }
LOGGER.log(Level.FINEST, "Updated all articles"); LOGGER.log(Level.TRACE, "Updated all articles");
} catch (final Exception e) { } catch (final Exception e) {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
......
...@@ -19,13 +19,13 @@ package org.b3log.solo.processor; ...@@ -19,13 +19,13 @@ package org.b3log.solo.processor;
import freemarker.template.Template; import freemarker.template.Template;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -96,7 +96,7 @@ public final class UserTemplateProcessor { ...@@ -96,7 +96,7 @@ public final class UserTemplateProcessor {
String templateName = StringUtils.substringAfterLast(requestURI, "/"); String templateName = StringUtils.substringAfterLast(requestURI, "/");
templateName = StringUtils.substringBefore(templateName, ".") + ".ftl"; templateName = StringUtils.substringBefore(templateName, ".") + ".ftl";
LOGGER.log(Level.FINE, "Shows page[requestURI={0}, templateName={1}]", new Object[] {requestURI, templateName}); LOGGER.log(Level.DEBUG, "Shows page[requestURI={0}, templateName={1}]", new Object[] {requestURI, templateName});
final AbstractFreeMarkerRenderer renderer = new FrontRenderer(); final AbstractFreeMarkerRenderer renderer = new FrontRenderer();
...@@ -113,7 +113,7 @@ public final class UserTemplateProcessor { ...@@ -113,7 +113,7 @@ public final class UserTemplateProcessor {
return; return;
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
...@@ -135,12 +135,12 @@ public final class UserTemplateProcessor { ...@@ -135,12 +135,12 @@ public final class UserTemplateProcessor {
request.setAttribute(PageCaches.CACHED_TYPE, langs.get(PageTypes.USER_TEMPLATE.getLangeLabel())); request.setAttribute(PageCaches.CACHED_TYPE, langs.get(PageTypes.USER_TEMPLATE.getLangeLabel()));
request.setAttribute(PageCaches.CACHED_LINK, requestURI); request.setAttribute(PageCaches.CACHED_LINK, requestURI);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
try { try {
response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (final IOException ex) { } catch (final IOException ex) {
LOGGER.severe(ex.getMessage()); LOGGER.error(ex.getMessage());
} }
} }
} }
......
...@@ -20,8 +20,6 @@ import java.util.Calendar; ...@@ -20,8 +20,6 @@ import java.util.Calendar;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
...@@ -29,6 +27,8 @@ import org.b3log.latke.Latkes; ...@@ -29,6 +27,8 @@ import org.b3log.latke.Latkes;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.event.EventManager; import org.b3log.latke.event.EventManager;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.plugin.ViewLoadEventData; import org.b3log.latke.plugin.ViewLoadEventData;
...@@ -137,7 +137,7 @@ public final class AdminConsole { ...@@ -137,7 +137,7 @@ public final class AdminConsole {
Keys.fillRuntime(dataModel); Keys.fillRuntime(dataModel);
filler.fillMinified(dataModel); filler.fillMinified(dataModel);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Admin index render failed", e); LOGGER.log(Level.ERROR, "Admin index render failed", e);
} }
fireFreeMarkerActionEvent(templateName, dataModel); fireFreeMarkerActionEvent(templateName, dataModel);
...@@ -169,7 +169,7 @@ public final class AdminConsole { ...@@ -169,7 +169,7 @@ public final class AdminConsole {
final String requestURI = request.getRequestURI(); final String requestURI = request.getRequestURI();
final String templateName = StringUtils.substringBetween(requestURI, Latkes.getContextPath() + '/', ".") + ".ftl"; final String templateName = StringUtils.substringBetween(requestURI, Latkes.getContextPath() + '/', ".") + ".ftl";
LOGGER.log(Level.FINEST, "Admin function[templateName={0}]", templateName); LOGGER.log(Level.TRACE, "Admin function[templateName={0}]", templateName);
renderer.setTemplateName(templateName); renderer.setTemplateName(templateName);
final Locale locale = Latkes.getLocale(); final Locale locale = Latkes.getLocale();
...@@ -215,7 +215,7 @@ public final class AdminConsole { ...@@ -215,7 +215,7 @@ public final class AdminConsole {
try { try {
preference = preferenceQueryService.getPreference(); preference = preferenceQueryService.getPreference();
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, "Loads preference failed", e); LOGGER.log(Level.ERROR, "Loads preference failed", e);
} }
final StringBuilder timeZoneIdOptions = new StringBuilder(); final StringBuilder timeZoneIdOptions = new StringBuilder();
...@@ -257,7 +257,7 @@ public final class AdminConsole { ...@@ -257,7 +257,7 @@ public final class AdminConsole {
dataModel.put(Plugin.PLUGINS, ""); dataModel.put(Plugin.PLUGINS, "");
} }
} catch (final EventException e) { } catch (final EventException e) {
LOGGER.log(Level.WARNING, "Event[FREEMARKER_ACTION] handle failed, ignores this exception for kernel health", e); LOGGER.log(Level.WARN, "Event[FREEMARKER_ACTION] handle failed, ignores this exception for kernel health", e);
} }
} }
} }
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -131,7 +131,7 @@ public final class ArticleConsole { ...@@ -131,7 +131,7 @@ public final class ArticleConsole {
result.put("html", html); result.put("html", html);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -192,7 +192,7 @@ public final class ArticleConsole { ...@@ -192,7 +192,7 @@ public final class ArticleConsole {
result.put(Keys.STATUS_CODE, true); result.put(Keys.STATUS_CODE, true);
renderer.setJSONObject(result); renderer.setJSONObject(result);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -280,7 +280,7 @@ public final class ArticleConsole { ...@@ -280,7 +280,7 @@ public final class ArticleConsole {
result.put(Keys.STATUS_CODE, true); result.put(Keys.STATUS_CODE, true);
renderer.setJSONObject(result); renderer.setJSONObject(result);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -337,7 +337,7 @@ public final class ArticleConsole { ...@@ -337,7 +337,7 @@ public final class ArticleConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("removeSuccLabel")); ret.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
...@@ -396,7 +396,7 @@ public final class ArticleConsole { ...@@ -396,7 +396,7 @@ public final class ArticleConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("unPulbishSuccLabel")); ret.put(Keys.MSG, langPropsService.get("unPulbishSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
...@@ -455,7 +455,7 @@ public final class ArticleConsole { ...@@ -455,7 +455,7 @@ public final class ArticleConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("cancelTopSuccLabel")); ret.put(Keys.MSG, langPropsService.get("cancelTopSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
...@@ -514,7 +514,7 @@ public final class ArticleConsole { ...@@ -514,7 +514,7 @@ public final class ArticleConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("putTopSuccLabel")); ret.put(Keys.MSG, langPropsService.get("putTopSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
...@@ -593,7 +593,7 @@ public final class ArticleConsole { ...@@ -593,7 +593,7 @@ public final class ArticleConsole {
ret.put(Keys.MSG, langPropsService.get("updateSuccLabel")); ret.put(Keys.MSG, langPropsService.get("updateSuccLabel"));
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -667,7 +667,7 @@ public final class ArticleConsole { ...@@ -667,7 +667,7 @@ public final class ArticleConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -17,12 +17,12 @@ package org.b3log.solo.processor.console; ...@@ -17,12 +17,12 @@ package org.b3log.solo.processor.console;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -115,7 +115,7 @@ public final class CommentConsole { ...@@ -115,7 +115,7 @@ public final class CommentConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
...@@ -164,7 +164,7 @@ public final class CommentConsole { ...@@ -164,7 +164,7 @@ public final class CommentConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
...@@ -233,7 +233,7 @@ public final class CommentConsole { ...@@ -233,7 +233,7 @@ public final class CommentConsole {
renderer.setJSONObject(result); renderer.setJSONObject(result);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -295,7 +295,7 @@ public final class CommentConsole { ...@@ -295,7 +295,7 @@ public final class CommentConsole {
ret.put(Comment.COMMENTS, comments); ret.put(Comment.COMMENTS, comments);
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -357,7 +357,7 @@ public final class CommentConsole { ...@@ -357,7 +357,7 @@ public final class CommentConsole {
ret.put(Comment.COMMENTS, comments); ret.put(Comment.COMMENTS, comments);
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -114,7 +114,7 @@ public final class LinkConsole { ...@@ -114,7 +114,7 @@ public final class LinkConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
...@@ -173,7 +173,7 @@ public final class LinkConsole { ...@@ -173,7 +173,7 @@ public final class LinkConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -234,7 +234,7 @@ public final class LinkConsole { ...@@ -234,7 +234,7 @@ public final class LinkConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -296,7 +296,7 @@ public final class LinkConsole { ...@@ -296,7 +296,7 @@ public final class LinkConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -364,7 +364,7 @@ public final class LinkConsole { ...@@ -364,7 +364,7 @@ public final class LinkConsole {
renderer.setJSONObject(result); renderer.setJSONObject(result);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -423,7 +423,7 @@ public final class LinkConsole { ...@@ -423,7 +423,7 @@ public final class LinkConsole {
renderer.setJSONObject(result); renderer.setJSONObject(result);
result.put(Keys.STATUS_CODE, true); result.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
...@@ -132,7 +132,7 @@ public final class PageConsole { ...@@ -132,7 +132,7 @@ public final class PageConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -183,7 +183,7 @@ public final class PageConsole { ...@@ -183,7 +183,7 @@ public final class PageConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
...@@ -247,7 +247,7 @@ public final class PageConsole { ...@@ -247,7 +247,7 @@ public final class PageConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { // May be permalink check exception } catch (final ServiceException e) { // May be permalink check exception
LOGGER.log(Level.WARNING, e.getMessage(), e); LOGGER.log(Level.WARN, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -306,7 +306,7 @@ public final class PageConsole { ...@@ -306,7 +306,7 @@ public final class PageConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -368,7 +368,7 @@ public final class PageConsole { ...@@ -368,7 +368,7 @@ public final class PageConsole {
result.put(Keys.STATUS_CODE, true); result.put(Keys.STATUS_CODE, true);
result.put(Keys.MSG, langPropsService.get("getSuccLabel")); result.put(Keys.MSG, langPropsService.get("getSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -444,7 +444,7 @@ public final class PageConsole { ...@@ -444,7 +444,7 @@ public final class PageConsole {
renderer.setJSONObject(result); renderer.setJSONObject(result);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -17,14 +17,12 @@ package org.b3log.solo.processor.console; ...@@ -17,14 +17,12 @@ package org.b3log.solo.processor.console;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
...@@ -171,7 +169,7 @@ public final class PluginConsole { ...@@ -171,7 +169,7 @@ public final class PluginConsole {
result.put(Keys.STATUS_CODE, true); result.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -210,7 +208,7 @@ public final class PluginConsole { ...@@ -210,7 +208,7 @@ public final class PluginConsole {
dataModel.put(Keys.OBJECT_ID, pluginId); dataModel.put(Keys.OBJECT_ID, pluginId);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
final JSONRenderer jsonRenderer = new JSONRenderer(); final JSONRenderer jsonRenderer = new JSONRenderer();
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
...@@ -124,7 +124,7 @@ public final class PreferenceConsole { ...@@ -124,7 +124,7 @@ public final class PreferenceConsole {
ret.put(Preference.REPLY_NOTIFICATION_TEMPLATE, replyNotificationTemplate); ret.put(Preference.REPLY_NOTIFICATION_TEMPLATE, replyNotificationTemplate);
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -177,7 +177,7 @@ public final class PreferenceConsole { ...@@ -177,7 +177,7 @@ public final class PreferenceConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -238,7 +238,7 @@ public final class PreferenceConsole { ...@@ -238,7 +238,7 @@ public final class PreferenceConsole {
ret.put(Sign.SIGNS, signs); ret.put(Sign.SIGNS, signs);
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -328,7 +328,7 @@ public final class PreferenceConsole { ...@@ -328,7 +328,7 @@ public final class PreferenceConsole {
ret.put(Preference.PREFERENCE, preference); ret.put(Preference.PREFERENCE, preference);
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -409,7 +409,7 @@ public final class PreferenceConsole { ...@@ -409,7 +409,7 @@ public final class PreferenceConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("updateSuccLabel")); ret.put(Keys.MSG, langPropsService.get("updateSuccLabel"));
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
......
...@@ -19,11 +19,11 @@ package org.b3log.solo.processor.console; ...@@ -19,11 +19,11 @@ package org.b3log.solo.processor.console;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HTTPRequestMethod;
...@@ -118,7 +118,7 @@ public final class TagConsole { ...@@ -118,7 +118,7 @@ public final class TagConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets tags failed", e); LOGGER.log(Level.ERROR, "Gets tags failed", e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
} }
...@@ -183,7 +183,7 @@ public final class TagConsole { ...@@ -183,7 +183,7 @@ public final class TagConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets unused tags failed", e); LOGGER.log(Level.ERROR, "Gets unused tags failed", e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
} }
...@@ -230,7 +230,7 @@ public final class TagConsole { ...@@ -230,7 +230,7 @@ public final class TagConsole {
jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Removes unused tags failed", e); LOGGER.log(Level.ERROR, "Removes unused tags failed", e);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
} }
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
...@@ -127,7 +127,7 @@ public final class UserConsole { ...@@ -127,7 +127,7 @@ public final class UserConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -193,7 +193,7 @@ public final class UserConsole { ...@@ -193,7 +193,7 @@ public final class UserConsole {
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -244,7 +244,7 @@ public final class UserConsole { ...@@ -244,7 +244,7 @@ public final class UserConsole {
jsonObject.put(Keys.STATUS_CODE, true); jsonObject.put(Keys.STATUS_CODE, true);
jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeSuccLabel"));
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
...@@ -308,7 +308,7 @@ public final class UserConsole { ...@@ -308,7 +308,7 @@ public final class UserConsole {
renderer.setJSONObject(result); renderer.setJSONObject(result);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -368,7 +368,7 @@ public final class UserConsole { ...@@ -368,7 +368,7 @@ public final class UserConsole {
result.put(Keys.STATUS_CODE, true); result.put(Keys.STATUS_CODE, true);
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = QueryResults.defaultResult(); final JSONObject jsonObject = QueryResults.defaultResult();
...@@ -420,7 +420,7 @@ public final class UserConsole { ...@@ -420,7 +420,7 @@ public final class UserConsole {
jsonObject.put(Keys.MSG, langPropsService.get("updateSuccLabel")); jsonObject.put(Keys.MSG, langPropsService.get("updateSuccLabel"));
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
jsonObject.put(Keys.STATUS_CODE, false); jsonObject.put(Keys.STATUS_CODE, false);
jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("removeFailLabel"));
......
...@@ -20,8 +20,8 @@ import freemarker.template.Configuration; ...@@ -20,8 +20,8 @@ import freemarker.template.Configuration;
import freemarker.template.Template; import freemarker.template.Template;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
import org.b3log.solo.SoloServletListener; import org.b3log.solo.SoloServletListener;
...@@ -55,7 +55,7 @@ public final class ConsoleRenderer extends AbstractFreeMarkerRenderer { ...@@ -55,7 +55,7 @@ public final class ConsoleRenderer extends AbstractFreeMarkerRenderer {
TEMPLATE_CFG.setDirectoryForTemplateLoading(new File(webRootPath)); TEMPLATE_CFG.setDirectoryForTemplateLoading(new File(webRootPath));
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} }
......
...@@ -17,12 +17,12 @@ package org.b3log.solo.processor.renderer; ...@@ -17,12 +17,12 @@ package org.b3log.solo.processor.renderer;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.HTTPRequestContext;
import org.b3log.latke.servlet.renderer.freemarker.CacheFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.freemarker.CacheFreeMarkerRenderer;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
...@@ -59,14 +59,14 @@ public final class FrontRenderer extends CacheFreeMarkerRenderer { ...@@ -59,14 +59,14 @@ public final class FrontRenderer extends CacheFreeMarkerRenderer {
*/ */
@Override @Override
protected void beforeRender(final HTTPRequestContext context) throws Exception { protected void beforeRender(final HTTPRequestContext context) throws Exception {
LOGGER.log(Level.FINEST, "Before render...."); LOGGER.log(Level.TRACE, "Before render....");
getDataModel().put(Common.TOP_BAR_REPLACEMENT_FLAG_KEY, Common.TOP_BAR_REPLACEMENT_FLAG); getDataModel().put(Common.TOP_BAR_REPLACEMENT_FLAG_KEY, Common.TOP_BAR_REPLACEMENT_FLAG);
} }
@Override @Override
protected void doRender(final String html, final HttpServletRequest request, final HttpServletResponse response) protected void doRender(final String html, final HttpServletRequest request, final HttpServletResponse response)
throws Exception { throws Exception {
LOGGER.log(Level.FINEST, "Do render...."); LOGGER.log(Level.TRACE, "Do render....");
response.setContentType("text/html"); response.setContentType("text/html");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
...@@ -99,7 +99,7 @@ public final class FrontRenderer extends CacheFreeMarkerRenderer { ...@@ -99,7 +99,7 @@ public final class FrontRenderer extends CacheFreeMarkerRenderer {
try { try {
statistics.incBlogViewCount(request, response); statistics.incBlogViewCount(request, response);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.WARNING, "Incs blog view count failed", e); LOGGER.log(Level.WARN, "Incs blog view count failed", e);
} }
// Write out // Write out
...@@ -117,7 +117,7 @@ public final class FrontRenderer extends CacheFreeMarkerRenderer { ...@@ -117,7 +117,7 @@ public final class FrontRenderer extends CacheFreeMarkerRenderer {
*/ */
@Override @Override
protected void afterRender(final HTTPRequestContext context) throws Exception { protected void afterRender(final HTTPRequestContext context) throws Exception {
LOGGER.log(Level.FINEST, "After render...."); LOGGER.log(Level.TRACE, "After render....");
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
......
...@@ -22,11 +22,11 @@ import java.io.IOException; ...@@ -22,11 +22,11 @@ import java.io.IOException;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
...@@ -131,13 +131,13 @@ public final class TopBars { ...@@ -131,13 +131,13 @@ public final class TopBars {
return stringWriter.toString(); return stringWriter.toString();
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.SEVERE, "Gens top bar HTML failed", e); LOGGER.log(Level.ERROR, "Gens top bar HTML failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.log(Level.SEVERE, "Gens top bar HTML failed", e); LOGGER.log(Level.ERROR, "Gens top bar HTML failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} catch (final TemplateException e) { } catch (final TemplateException e) {
LOGGER.log(Level.SEVERE, "Gens top bar HTML failed", e); LOGGER.log(Level.ERROR, "Gens top bar HTML failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} finally { } finally {
Stopwatchs.end(); Stopwatchs.end();
......
...@@ -19,10 +19,10 @@ package org.b3log.solo.repository.impl; ...@@ -19,10 +19,10 @@ package org.b3log.solo.repository.impl;
import java.text.ParseException; import java.text.ParseException;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.latke.util.CollectionUtils; import org.b3log.latke.util.CollectionUtils;
import org.b3log.solo.model.ArchiveDate; import org.b3log.solo.model.ArchiveDate;
...@@ -57,11 +57,11 @@ public final class ArchiveDateRepositoryImpl extends AbstractRepository implemen ...@@ -57,11 +57,11 @@ public final class ArchiveDateRepositoryImpl extends AbstractRepository implemen
try { try {
time = DateUtils.parseDate(archiveDate, new String[] {"yyyy/MM"}).getTime(); time = DateUtils.parseDate(archiveDate, new String[] {"yyyy/MM"}).getTime();
} catch (final ParseException e) { } catch (final ParseException e) {
LOGGER.log(Level.SEVERE, "Can not parse archive date [" + archiveDate + "]", e); LOGGER.log(Level.ERROR, "Can not parse archive date [" + archiveDate + "]", e);
throw new RepositoryException("Can not parse archive date [" + archiveDate + "]"); throw new RepositoryException("Can not parse archive date [" + archiveDate + "]");
} }
LOGGER.log(Level.FINEST, "Archive date [{0}] parsed to time [{1}]", new Object[] {archiveDate, time}); LOGGER.log(Level.TRACE, "Archive date [{0}] parsed to time [{1}]", new Object[] {archiveDate, time});
final Query query = new Query(); final Query query = new Query();
......
...@@ -19,9 +19,9 @@ package org.b3log.solo.repository.impl; ...@@ -19,9 +19,9 @@ package org.b3log.solo.repository.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.latke.util.CollectionUtils; import org.b3log.latke.util.CollectionUtils;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
...@@ -199,7 +199,7 @@ public final class ArticleRepositoryImpl extends AbstractRepository implements A ...@@ -199,7 +199,7 @@ public final class ArticleRepositoryImpl extends AbstractRepository implements A
final double mid = Math.random() + RANDOM_RANGE; final double mid = Math.random() + RANDOM_RANGE;
LOGGER.log(Level.FINEST, "Random mid[{0}]", mid); LOGGER.log(Level.TRACE, "Random mid[{0}]", mid);
Query query = new Query(); Query query = new Query();
......
...@@ -19,10 +19,10 @@ package org.b3log.solo.repository.impl; ...@@ -19,10 +19,10 @@ package org.b3log.solo.repository.impl;
import java.io.Serializable; import java.io.Serializable;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.cache.Cache; import org.b3log.latke.cache.Cache;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.solo.model.Comment; import org.b3log.solo.model.Comment;
import org.b3log.solo.repository.CommentRepository; import org.b3log.solo.repository.CommentRepository;
...@@ -72,7 +72,7 @@ public final class CommentRepositoryImpl extends AbstractRepository implements C ...@@ -72,7 +72,7 @@ public final class CommentRepositoryImpl extends AbstractRepository implements C
remove(commentId); remove(commentId);
} }
LOGGER.log(Level.FINER, "Removed comments[onId={0}, removedCnt={1}]", new Object[] {onId, comments.size()}); LOGGER.log(Level.DEBUG, "Removed comments[onId={0}, removedCnt={1}]", new Object[] {onId, comments.size()});
return comments.size(); return comments.size();
} }
...@@ -131,7 +131,7 @@ public final class CommentRepositoryImpl extends AbstractRepository implements C ...@@ -131,7 +131,7 @@ public final class CommentRepositoryImpl extends AbstractRepository implements C
* @throws RepositoryException repository exception * @throws RepositoryException repository exception
*/ */
private void removeForUnpublishedArticles(final List<JSONObject> comments) throws RepositoryException { private void removeForUnpublishedArticles(final List<JSONObject> comments) throws RepositoryException {
LOGGER.finer("Removing unpublished articles' comments...."); LOGGER.debug("Removing unpublished articles' comments....");
final Iterator<JSONObject> iterator = comments.iterator(); final Iterator<JSONObject> iterator = comments.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
...@@ -147,7 +147,7 @@ public final class CommentRepositoryImpl extends AbstractRepository implements C ...@@ -147,7 +147,7 @@ public final class CommentRepositoryImpl extends AbstractRepository implements C
} }
} }
LOGGER.finer("Removed unpublished articles' comments...."); LOGGER.debug("Removed unpublished articles' comments....");
} }
/** /**
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
package org.b3log.solo.repository.impl; package org.b3log.solo.repository.impl;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.solo.model.Link; import org.b3log.solo.model.Link;
import org.b3log.solo.repository.LinkRepository; import org.b3log.solo.repository.LinkRepository;
...@@ -34,11 +34,6 @@ import org.json.JSONObject; ...@@ -34,11 +34,6 @@ import org.json.JSONObject;
*/ */
public final class LinkRepositoryImpl extends AbstractRepository implements LinkRepository { public final class LinkRepositoryImpl extends AbstractRepository implements LinkRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(LinkRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.b3log.solo.repository.impl; package org.b3log.solo.repository.impl;
import java.util.logging.Logger;
import org.b3log.latke.repository.AbstractRepository; import org.b3log.latke.repository.AbstractRepository;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.repository.OptionRepository; import org.b3log.solo.repository.OptionRepository;
...@@ -32,11 +30,6 @@ import org.b3log.solo.repository.OptionRepository; ...@@ -32,11 +30,6 @@ import org.b3log.solo.repository.OptionRepository;
*/ */
public final class OptionRepositoryImpl extends AbstractRepository implements OptionRepository { public final class OptionRepositoryImpl extends AbstractRepository implements OptionRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(OptionRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -17,7 +17,6 @@ package org.b3log.solo.repository.impl; ...@@ -17,7 +17,6 @@ package org.b3log.solo.repository.impl;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.latke.util.CollectionUtils; import org.b3log.latke.util.CollectionUtils;
...@@ -36,11 +35,6 @@ import org.json.JSONObject; ...@@ -36,11 +35,6 @@ import org.json.JSONObject;
*/ */
public final class PageRepositoryImpl extends AbstractRepository implements PageRepository { public final class PageRepositoryImpl extends AbstractRepository implements PageRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(PageRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.b3log.solo.repository.impl; package org.b3log.solo.repository.impl;
import java.util.logging.Logger;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.repository.AbstractRepository; import org.b3log.latke.repository.AbstractRepository;
import org.b3log.solo.repository.PluginRepository; import org.b3log.solo.repository.PluginRepository;
...@@ -32,11 +30,6 @@ import org.b3log.solo.repository.PluginRepository; ...@@ -32,11 +30,6 @@ import org.b3log.solo.repository.PluginRepository;
*/ */
public final class PluginRepositoryImpl extends AbstractRepository implements PluginRepository { public final class PluginRepositoryImpl extends AbstractRepository implements PluginRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(PluginRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.b3log.solo.repository.impl; package org.b3log.solo.repository.impl;
import java.util.logging.Logger;
import org.b3log.latke.repository.AbstractRepository; import org.b3log.latke.repository.AbstractRepository;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.solo.model.Preference; import org.b3log.solo.model.Preference;
...@@ -33,11 +32,6 @@ import org.json.JSONObject; ...@@ -33,11 +32,6 @@ import org.json.JSONObject;
*/ */
public final class PreferenceRepositoryImpl extends AbstractRepository implements PreferenceRepository { public final class PreferenceRepositoryImpl extends AbstractRepository implements PreferenceRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(PreferenceRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.b3log.solo.repository.impl; package org.b3log.solo.repository.impl;
import java.util.logging.Logger;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.repository.AbstractRepository; import org.b3log.latke.repository.AbstractRepository;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
...@@ -35,11 +34,6 @@ import org.json.JSONObject; ...@@ -35,11 +34,6 @@ import org.json.JSONObject;
*/ */
public final class StatisticRepositoryImpl extends AbstractRepository implements StatisticRepository { public final class StatisticRepositoryImpl extends AbstractRepository implements StatisticRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(StatisticRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -17,7 +17,6 @@ package org.b3log.solo.repository.impl; ...@@ -17,7 +17,6 @@ package org.b3log.solo.repository.impl;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Tag; import org.b3log.solo.model.Tag;
import org.b3log.solo.repository.TagArticleRepository; import org.b3log.solo.repository.TagArticleRepository;
...@@ -37,11 +36,6 @@ import org.json.JSONObject; ...@@ -37,11 +36,6 @@ import org.json.JSONObject;
*/ */
public final class TagArticleRepositoryImpl extends AbstractRepository implements TagArticleRepository { public final class TagArticleRepositoryImpl extends AbstractRepository implements TagArticleRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(TagArticleRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -18,7 +18,6 @@ package org.b3log.solo.repository.impl; ...@@ -18,7 +18,6 @@ package org.b3log.solo.repository.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.b3log.solo.model.Tag; import org.b3log.solo.model.Tag;
import org.b3log.solo.repository.TagRepository; import org.b3log.solo.repository.TagRepository;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
...@@ -37,11 +36,6 @@ import org.json.JSONObject; ...@@ -37,11 +36,6 @@ import org.json.JSONObject;
*/ */
public final class TagRepositoryImpl extends AbstractRepository implements TagRepository { public final class TagRepositoryImpl extends AbstractRepository implements TagRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(TagRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.b3log.solo.repository.impl; package org.b3log.solo.repository.impl;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
...@@ -35,11 +34,6 @@ import org.json.JSONObject; ...@@ -35,11 +34,6 @@ import org.json.JSONObject;
*/ */
public final class UserRepositoryImpl extends AbstractRepository implements UserRepository { public final class UserRepositoryImpl extends AbstractRepository implements UserRepository {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(UserRepositoryImpl.class.getName());
/** /**
* Singleton. * Singleton.
*/ */
......
...@@ -17,8 +17,8 @@ package org.b3log.solo.service; ...@@ -17,8 +17,8 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.solo.model.ArchiveDate; import org.b3log.solo.model.ArchiveDate;
...@@ -56,7 +56,7 @@ public final class ArchiveDateQueryService { ...@@ -56,7 +56,7 @@ public final class ArchiveDateQueryService {
try { try {
return archiveDateRepository.getArchiveDates(); return archiveDateRepository.getArchiveDates();
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets archive dates failed", e); LOGGER.log(Level.ERROR, "Gets archive dates failed", e);
throw new ServiceException("Gets archive dates failed"); throw new ServiceException("Gets archive dates failed");
} }
} }
...@@ -92,7 +92,7 @@ public final class ArchiveDateQueryService { ...@@ -92,7 +92,7 @@ public final class ArchiveDateQueryService {
return ret; return ret;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets archive date[string=" + archiveDateString + "] failed", e); LOGGER.log(Level.ERROR, "Gets archive date[string=" + archiveDateString + "] failed", e);
throw new ServiceException("Gets archive date[string=" + archiveDateString + "] failed"); throw new ServiceException("Gets archive date[string=" + archiveDateString + "] failed");
} }
} }
......
...@@ -21,14 +21,14 @@ import java.util.ArrayList; ...@@ -21,14 +21,14 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.event.EventManager; import org.b3log.latke.event.EventManager;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
...@@ -182,7 +182,7 @@ public final class ArticleMgmtService { ...@@ -182,7 +182,7 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Cancels publish article failed", e); LOGGER.log(Level.ERROR, "Cancels publish article failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -212,7 +212,7 @@ public final class ArticleMgmtService { ...@@ -212,7 +212,7 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Can't put the article[oId{0}] to top", articleId); LOGGER.log(Level.ERROR, "Can't put the article[oId{0}] to top", articleId);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -335,7 +335,7 @@ public final class ArticleMgmtService { ...@@ -335,7 +335,7 @@ public final class ArticleMgmtService {
try { try {
eventManager.fireEventSynchronously(new Event<JSONObject>(EventTypes.ADD_ARTICLE, eventData)); eventManager.fireEventSynchronously(new Event<JSONObject>(EventTypes.ADD_ARTICLE, eventData));
} catch (final EventException e) { } catch (final EventException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} else { } else {
// Fire update article event // Fire update article event
...@@ -346,7 +346,7 @@ public final class ArticleMgmtService { ...@@ -346,7 +346,7 @@ public final class ArticleMgmtService {
try { try {
eventManager.fireEventSynchronously(new Event<JSONObject>(EventTypes.UPDATE_ARTICLE, eventData)); eventManager.fireEventSynchronously(new Event<JSONObject>(EventTypes.UPDATE_ARTICLE, eventData));
} catch (final EventException e) { } catch (final EventException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
} }
...@@ -356,7 +356,7 @@ public final class ArticleMgmtService { ...@@ -356,7 +356,7 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates an article failed", e); LOGGER.log(Level.ERROR, "Updates an article failed", e);
throw e; throw e;
} catch (final Exception e) { } catch (final Exception e) {
...@@ -364,7 +364,7 @@ public final class ArticleMgmtService { ...@@ -364,7 +364,7 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates an article failed", e); LOGGER.log(Level.ERROR, "Updates an article failed", e);
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
...@@ -516,11 +516,11 @@ public final class ArticleMgmtService { ...@@ -516,11 +516,11 @@ public final class ArticleMgmtService {
article.remove(Common.POST_TO_COMMUNITY); article.remove(Common.POST_TO_COMMUNITY);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Adds an article failed", e); LOGGER.log(Level.ERROR, "Adds an article failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} catch (final EventException e) { } catch (final EventException e) {
LOGGER.log(Level.WARNING, "Adds an article event process failed", e); LOGGER.log(Level.WARN, "Adds an article event process failed", e);
} }
return ret; return ret;
...@@ -533,7 +533,7 @@ public final class ArticleMgmtService { ...@@ -533,7 +533,7 @@ public final class ArticleMgmtService {
* @throws ServiceException service exception * @throws ServiceException service exception
*/ */
public void removeArticle(final String articleId) throws ServiceException { public void removeArticle(final String articleId) throws ServiceException {
LOGGER.log(Level.FINER, "Removing an article[id={0}]", articleId); LOGGER.log(Level.DEBUG, "Removing an article[id={0}]", articleId);
final Transaction transaction = articleRepository.beginTransaction(); final Transaction transaction = articleRepository.beginTransaction();
...@@ -564,11 +564,11 @@ public final class ArticleMgmtService { ...@@ -564,11 +564,11 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes an article[id=" + articleId + "] failed", e); LOGGER.log(Level.ERROR, "Removes an article[id=" + articleId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
LOGGER.log(Level.FINER, "Removed an article[id={0}]", articleId); LOGGER.log(Level.DEBUG, "Removed an article[id={0}]", articleId);
} }
/** /**
...@@ -598,7 +598,7 @@ public final class ArticleMgmtService { ...@@ -598,7 +598,7 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.WARNING, "Updates article random value failed"); LOGGER.log(Level.WARN, "Updates article random value failed");
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -620,7 +620,7 @@ public final class ArticleMgmtService { ...@@ -620,7 +620,7 @@ public final class ArticleMgmtService {
return; return;
} }
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets article [id=" + articleId + "] failed", e); LOGGER.log(Level.ERROR, "Gets article [id=" + articleId + "] failed", e);
return; return;
} }
...@@ -638,7 +638,7 @@ public final class ArticleMgmtService { ...@@ -638,7 +638,7 @@ public final class ArticleMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.WARNING, "Updates article view count failed"); LOGGER.log(Level.WARN, "Updates article view count failed");
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -669,17 +669,17 @@ public final class ArticleMgmtService { ...@@ -669,17 +669,17 @@ public final class ArticleMgmtService {
tag.put(Tag.TAG_PUBLISHED_REFERENCE_COUNT, publishedRefCnt); tag.put(Tag.TAG_PUBLISHED_REFERENCE_COUNT, publishedRefCnt);
} }
tagRepository.update(tagId, tag); tagRepository.update(tagId, tag);
LOGGER.log(Level.FINEST, "Deced tag[title={0}, refCnt={1}, publishedRefCnt={2}] of article[id={3}]", LOGGER.log(Level.TRACE, "Deced tag[title={0}, refCnt={1}, publishedRefCnt={2}] of article[id={3}]",
new Object[] { new Object[] {
tag.getString(Tag.TAG_TITLE), tag.getInt(Tag.TAG_REFERENCE_COUNT), tag.getInt(Tag.TAG_PUBLISHED_REFERENCE_COUNT), tag.getString(Tag.TAG_TITLE), tag.getInt(Tag.TAG_REFERENCE_COUNT), tag.getInt(Tag.TAG_PUBLISHED_REFERENCE_COUNT),
articleId}); articleId});
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Decs tag references count of article[id" + articleId + "] failed", e); LOGGER.log(Level.ERROR, "Decs tag references count of article[id" + articleId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
LOGGER.log(Level.FINER, "Deced all tag reference count of article[id={0}]", articleId); LOGGER.log(Level.DEBUG, "Deced all tag reference count of article[id={0}]", articleId);
} }
/** /**
...@@ -716,7 +716,7 @@ public final class ArticleMgmtService { ...@@ -716,7 +716,7 @@ public final class ArticleMgmtService {
archiveDateArticleRepository.remove(archiveDateArticleRelation.getString(Keys.OBJECT_ID)); archiveDateArticleRepository.remove(archiveDateArticleRelation.getString(Keys.OBJECT_ID));
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Unarchive date for article[id=" + articleId + "] failed", e); LOGGER.log(Level.ERROR, "Unarchive date for article[id=" + articleId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -789,7 +789,7 @@ public final class ArticleMgmtService { ...@@ -789,7 +789,7 @@ public final class ArticleMgmtService {
final String newTagTitle = newTag.getString(Tag.TAG_TITLE); final String newTagTitle = newTag.getString(Tag.TAG_TITLE);
if (!tagExists(newTagTitle, oldTags)) { if (!tagExists(newTagTitle, oldTags)) {
LOGGER.log(Level.FINER, "Tag need to add[title={0}]", newTagTitle); LOGGER.log(Level.DEBUG, "Tag need to add[title={0}]", newTagTitle);
tagsNeedToAdd.add(newTag); tagsNeedToAdd.add(newTag);
} else { } else {
tagsUnchanged.add(newTag); tagsUnchanged.add(newTag);
...@@ -799,14 +799,14 @@ public final class ArticleMgmtService { ...@@ -799,14 +799,14 @@ public final class ArticleMgmtService {
final String oldTagTitle = oldTag.getString(Tag.TAG_TITLE); final String oldTagTitle = oldTag.getString(Tag.TAG_TITLE);
if (!tagExists(oldTagTitle, newTags)) { if (!tagExists(oldTagTitle, newTags)) {
LOGGER.log(Level.FINER, "Tag dropped[title={0}]", oldTag); LOGGER.log(Level.DEBUG, "Tag dropped[title={0}]", oldTag);
tagsDropped.add(oldTag); tagsDropped.add(oldTag);
} else { } else {
tagsUnchanged.remove(oldTag); tagsUnchanged.remove(oldTag);
} }
} }
LOGGER.log(Level.FINER, "Tags unchanged[{0}]", tagsUnchanged); LOGGER.log(Level.DEBUG, "Tags unchanged[{0}]", tagsUnchanged);
for (final JSONObject tagUnchanged : tagsUnchanged) { for (final JSONObject tagUnchanged : tagsUnchanged) {
final String tagId = tagUnchanged.optString(Keys.OBJECT_ID); final String tagId = tagUnchanged.optString(Keys.OBJECT_ID);
...@@ -934,7 +934,7 @@ public final class ArticleMgmtService { ...@@ -934,7 +934,7 @@ public final class ArticleMgmtService {
String tagId; String tagId;
if (null == tag) { if (null == tag) {
LOGGER.log(Level.FINEST, "Found a new tag[title={0}] in article[title={1}]", LOGGER.log(Level.TRACE, "Found a new tag[title={0}] in article[title={1}]",
new Object[] {tagTitle, article.optString(Article.ARTICLE_TITLE)}); new Object[] {tagTitle, article.optString(Article.ARTICLE_TITLE)});
tag = new JSONObject(); tag = new JSONObject();
tag.put(Tag.TAG_TITLE, tagTitle); tag.put(Tag.TAG_TITLE, tagTitle);
...@@ -949,7 +949,7 @@ public final class ArticleMgmtService { ...@@ -949,7 +949,7 @@ public final class ArticleMgmtService {
tag.put(Keys.OBJECT_ID, tagId); tag.put(Keys.OBJECT_ID, tagId);
} else { } else {
tagId = tag.optString(Keys.OBJECT_ID); tagId = tag.optString(Keys.OBJECT_ID);
LOGGER.log(Level.FINEST, "Found a existing tag[title={0}, id={1}] in article[title={2}]", LOGGER.log(Level.TRACE, "Found a existing tag[title={0}, id={1}] in article[title={2}]",
new Object[] {tag.optString(Tag.TAG_TITLE), tag.optString(Keys.OBJECT_ID), article.optString(Article.ARTICLE_TITLE)}); new Object[] {tag.optString(Tag.TAG_TITLE), tag.optString(Keys.OBJECT_ID), article.optString(Article.ARTICLE_TITLE)});
final JSONObject tagTmp = new JSONObject(); final JSONObject tagTmp = new JSONObject();
...@@ -1046,7 +1046,7 @@ public final class ArticleMgmtService { ...@@ -1046,7 +1046,7 @@ public final class ArticleMgmtService {
archiveDateRepository.add(archiveDate); archiveDateRepository.add(archiveDate);
} catch (final ParseException e) { } catch (final ParseException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new RepositoryException(e); throw new RepositoryException(e);
} }
} }
......
...@@ -22,9 +22,9 @@ import java.util.Date; ...@@ -22,9 +22,9 @@ import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
...@@ -117,7 +117,7 @@ public final class ArticleQueryService { ...@@ -117,7 +117,7 @@ public final class ArticleQueryService {
try { try {
return articleRepository.getRecentArticles(fetchSize); return articleRepository.getRecentArticles(fetchSize);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets recent articles failed", e); LOGGER.log(Level.ERROR, "Gets recent articles failed", e);
return Collections.emptyList(); return Collections.emptyList();
} }
...@@ -197,11 +197,11 @@ public final class ArticleQueryService { ...@@ -197,11 +197,11 @@ public final class ArticleQueryService {
article.remove(ARTICLE_VIEW_COUNT); article.remove(ARTICLE_VIEW_COUNT);
article.remove(ARTICLE_RANDOM_DOUBLE); article.remove(ARTICLE_RANDOM_DOUBLE);
LOGGER.log(Level.FINER, "Got an article[id={0}]", articleId); LOGGER.log(Level.DEBUG, "Got an article[id={0}]", articleId);
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets an article failed", e); LOGGER.log(Level.ERROR, "Gets an article failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -316,7 +316,7 @@ public final class ArticleQueryService { ...@@ -316,7 +316,7 @@ public final class ArticleQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets articles failed", e); LOGGER.log(Level.ERROR, "Gets articles failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -376,7 +376,7 @@ public final class ArticleQueryService { ...@@ -376,7 +376,7 @@ public final class ArticleQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets articles by tag[id=" + tagId + "] failed", e); LOGGER.log(Level.ERROR, "Gets articles by tag[id=" + tagId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -436,7 +436,7 @@ public final class ArticleQueryService { ...@@ -436,7 +436,7 @@ public final class ArticleQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets articles by archive date[id=" + archiveDateId + "] failed", e); LOGGER.log(Level.ERROR, "Gets articles by archive date[id=" + archiveDateId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -461,7 +461,7 @@ public final class ArticleQueryService { ...@@ -461,7 +461,7 @@ public final class ArticleQueryService {
return ret; return ret;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets articles randomly failed[fetchSize=" + fetchSize + "]", e); LOGGER.log(Level.ERROR, "Gets articles randomly failed[fetchSize=" + fetchSize + "]", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -541,7 +541,7 @@ public final class ArticleQueryService { ...@@ -541,7 +541,7 @@ public final class ArticleQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets relevant articles failed", e); LOGGER.log(Level.ERROR, "Gets relevant articles failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -558,7 +558,7 @@ public final class ArticleQueryService { ...@@ -558,7 +558,7 @@ public final class ArticleQueryService {
try { try {
return articleRepository.isPublished(articleId); return articleRepository.isPublished(articleId);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Determines the article publish status failed[articleId=" + articleId + "]", e); LOGGER.log(Level.ERROR, "Determines the article publish status failed[articleId=" + articleId + "]", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -585,7 +585,7 @@ public final class ArticleQueryService { ...@@ -585,7 +585,7 @@ public final class ArticleQueryService {
try { try {
return articleRepository.getNextArticle(articleId); return articleRepository.getNextArticle(articleId);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets the next article failed[articleId=" + articleId + "]", e); LOGGER.log(Level.ERROR, "Gets the next article failed[articleId=" + articleId + "]", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -612,7 +612,7 @@ public final class ArticleQueryService { ...@@ -612,7 +612,7 @@ public final class ArticleQueryService {
try { try {
return articleRepository.getPreviousArticle(articleId); return articleRepository.getPreviousArticle(articleId);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets the previous article failed[articleId=" + articleId + "]", e); LOGGER.log(Level.ERROR, "Gets the previous article failed[articleId=" + articleId + "]", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -632,7 +632,7 @@ public final class ArticleQueryService { ...@@ -632,7 +632,7 @@ public final class ArticleQueryService {
try { try {
return articleRepository.get(articleId); return articleRepository.get(articleId);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets an article[articleId=" + articleId + "] failed", e); LOGGER.log(Level.ERROR, "Gets an article[articleId=" + articleId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -666,7 +666,7 @@ public final class ArticleQueryService { ...@@ -666,7 +666,7 @@ public final class ArticleQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, LOGGER.log(Level.ERROR,
"Gets articles by author email failed[authorEmail=" + authorEmail + ", currentPageNum=" + currentPageNum + ", pageSize=" "Gets articles by author email failed[authorEmail=" + authorEmail + ", currentPageNum=" + currentPageNum + ", pageSize="
+ pageSize + "]", + pageSize + "]",
e); e);
...@@ -709,7 +709,7 @@ public final class ArticleQueryService { ...@@ -709,7 +709,7 @@ public final class ArticleQueryService {
return article.getString(Article.ARTICLE_CONTENT); return article.getString(Article.ARTICLE_CONTENT);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets article content failed[articleId=" + articleId + "]", e); LOGGER.log(Level.ERROR, "Gets article content failed[articleId=" + articleId + "]", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -19,8 +19,6 @@ package org.b3log.solo.service; ...@@ -19,8 +19,6 @@ package org.b3log.solo.service;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.Date; import java.util.Date;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
...@@ -28,6 +26,8 @@ import org.b3log.latke.Keys; ...@@ -28,6 +26,8 @@ import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventManager; import org.b3log.latke.event.EventManager;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -179,7 +179,7 @@ public final class CommentMgmtService { ...@@ -179,7 +179,7 @@ public final class CommentMgmtService {
comment.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName); comment.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName);
ret.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName); ret.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName);
} else { } else {
LOGGER.log(Level.WARNING, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]", LOGGER.log(Level.WARN, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]",
new String[] {originalCommentId, commentName, commentContent}); new String[] {originalCommentId, commentName, commentContent});
} }
} }
...@@ -207,7 +207,7 @@ public final class CommentMgmtService { ...@@ -207,7 +207,7 @@ public final class CommentMgmtService {
try { try {
Comments.sendNotificationMail(page, comment, originalComment, preference); Comments.sendNotificationMail(page, comment, originalComment, preference);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.WARNING, "Send mail failed", e); LOGGER.log(Level.WARN, "Send mail failed", e);
} }
// Step 5: Fire add comment event // Step 5: Fire add comment event
final JSONObject eventData = new JSONObject(); final JSONObject eventData = new JSONObject();
...@@ -300,7 +300,7 @@ public final class CommentMgmtService { ...@@ -300,7 +300,7 @@ public final class CommentMgmtService {
comment.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName); comment.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName);
ret.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName); ret.put(Comment.COMMENT_ORIGINAL_COMMENT_NAME, originalCommentName);
} else { } else {
LOGGER.log(Level.WARNING, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]", LOGGER.log(Level.WARN, "Not found orginal comment[id={0}] of reply[name={1}, content={2}]",
new String[] {originalCommentId, commentName, commentContent}); new String[] {originalCommentId, commentName, commentContent});
} }
} }
...@@ -328,7 +328,7 @@ public final class CommentMgmtService { ...@@ -328,7 +328,7 @@ public final class CommentMgmtService {
try { try {
Comments.sendNotificationMail(article, comment, originalComment, preference); Comments.sendNotificationMail(article, comment, originalComment, preference);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.WARNING, "Send mail failed", e); LOGGER.log(Level.WARN, "Send mail failed", e);
} }
// Step 5: Fire add comment event // Step 5: Fire add comment event
final JSONObject eventData = new JSONObject(); final JSONObject eventData = new JSONObject();
...@@ -378,7 +378,7 @@ public final class CommentMgmtService { ...@@ -378,7 +378,7 @@ public final class CommentMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes a comment of a page failed", e); LOGGER.log(Level.ERROR, "Removes a comment of a page failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -411,7 +411,7 @@ public final class CommentMgmtService { ...@@ -411,7 +411,7 @@ public final class CommentMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes a comment of an article failed", e); LOGGER.log(Level.ERROR, "Removes a comment of an article failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -499,7 +499,7 @@ public final class CommentMgmtService { ...@@ -499,7 +499,7 @@ public final class CommentMgmtService {
statusCode = response.getResponseCode(); statusCode = response.getResponseCode();
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.log(Level.WARNING, "Can not fetch thumbnail from Gravatar[commentEmail={0}]", commentEmail); LOGGER.log(Level.WARN, "Can not fetch thumbnail from Gravatar[commentEmail={0}]", commentEmail);
} finally { } finally {
if (HttpServletResponse.SC_OK != statusCode) { if (HttpServletResponse.SC_OK != statusCode) {
thumbnailURL = Latkes.getStaticServePath() + "/images/" + DEFAULT_USER_THUMBNAIL; thumbnailURL = Latkes.getStaticServePath() + "/images/" + DEFAULT_USER_THUMBNAIL;
......
...@@ -19,10 +19,10 @@ package org.b3log.solo.service; ...@@ -19,10 +19,10 @@ package org.b3log.solo.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.SortDirection; import org.b3log.latke.repository.SortDirection;
...@@ -168,7 +168,7 @@ public final class CommentQueryService { ...@@ -168,7 +168,7 @@ public final class CommentQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets comments failed", e); LOGGER.log(Level.ERROR, "Gets comments failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -206,7 +206,7 @@ public final class CommentQueryService { ...@@ -206,7 +206,7 @@ public final class CommentQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets comments failed", e); LOGGER.log(Level.ERROR, "Gets comments failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
......
...@@ -22,14 +22,14 @@ import java.text.ParseException; ...@@ -22,14 +22,14 @@ import java.text.ParseException;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeEnv; import org.b3log.latke.RuntimeEnv;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
...@@ -196,13 +196,13 @@ public final class InitService { ...@@ -196,13 +196,13 @@ public final class InitService {
break; break;
} catch (final Exception e) { } catch (final Exception e) {
if (0 == retries) { if (0 == retries) {
LOGGER.log(Level.SEVERE, "Initialize B3log Solo error", e); LOGGER.log(Level.ERROR, "Initialize B3log Solo error", e);
throw new ServiceException("Initailize B3log Solo error: " + e.getMessage()); throw new ServiceException("Initailize B3log Solo error: " + e.getMessage());
} }
// Allow retry to occur // Allow retry to occur
--retries; --retries;
LOGGER.log(Level.WARNING, "Retrying to init B3log Solo[retries={0}]", retries); LOGGER.log(Level.WARN, "Retrying to init B3log Solo[retries={0}]", retries);
} finally { } finally {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
...@@ -220,7 +220,7 @@ public final class InitService { ...@@ -220,7 +220,7 @@ public final class InitService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Hello World error?!", e); LOGGER.log(Level.ERROR, "Hello World error?!", e);
} }
} }
...@@ -321,7 +321,7 @@ public final class InitService { ...@@ -321,7 +321,7 @@ public final class InitService {
admin.put(UserExt.USER_PUBLISHED_ARTICLE_COUNT, 1); admin.put(UserExt.USER_PUBLISHED_ARTICLE_COUNT, 1);
userRepository.update(admin.optString(Keys.OBJECT_ID), admin); userRepository.update(admin.optString(Keys.OBJECT_ID), admin);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Adds an article failed", e); LOGGER.log(Level.ERROR, "Adds an article failed", e);
throw new RepositoryException(e); throw new RepositoryException(e);
} }
...@@ -355,7 +355,7 @@ public final class InitService { ...@@ -355,7 +355,7 @@ public final class InitService {
archiveDateRepository.add(archiveDate); archiveDateRepository.add(archiveDate);
} catch (final ParseException e) { } catch (final ParseException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new RepositoryException(e); throw new RepositoryException(e);
} }
...@@ -401,7 +401,7 @@ public final class InitService { ...@@ -401,7 +401,7 @@ public final class InitService {
final String tagTitle = tagTitles[i].trim(); final String tagTitle = tagTitles[i].trim();
final JSONObject tag = new JSONObject(); final JSONObject tag = new JSONObject();
LOGGER.log(Level.FINEST, "Found a new tag[title={0}] in article[title={1}]", LOGGER.log(Level.TRACE, "Found a new tag[title={0}] in article[title={1}]",
new Object[] {tagTitle, article.optString(Article.ARTICLE_TITLE)}); new Object[] {tagTitle, article.optString(Article.ARTICLE_TITLE)});
tag.put(Tag.TAG_TITLE, tagTitle); tag.put(Tag.TAG_TITLE, tagTitle);
tag.put(Tag.TAG_REFERENCE_COUNT, 1); tag.put(Tag.TAG_REFERENCE_COUNT, 1);
...@@ -562,7 +562,7 @@ public final class InitService { ...@@ -562,7 +562,7 @@ public final class InitService {
Templates.MAIN_CFG.setDirectoryForTemplateLoading(new File(skinPath)); Templates.MAIN_CFG.setDirectoryForTemplateLoading(new File(skinPath));
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.log(Level.SEVERE, "Loads skins error!", e); LOGGER.log(Level.ERROR, "Loads skins error!", e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
package org.b3log.solo.service; package org.b3log.solo.service;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.solo.model.Link; import org.b3log.solo.model.Link;
...@@ -65,7 +65,7 @@ public final class LinkMgmtService { ...@@ -65,7 +65,7 @@ public final class LinkMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes a link[id=" + linkId + "] failed", e); LOGGER.log(Level.ERROR, "Removes a link[id=" + linkId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -104,7 +104,7 @@ public final class LinkMgmtService { ...@@ -104,7 +104,7 @@ public final class LinkMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -139,7 +139,7 @@ public final class LinkMgmtService { ...@@ -139,7 +139,7 @@ public final class LinkMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.WARNING, "Cant not find the target link of source link[order={0}]", srcLinkOrder); LOGGER.log(Level.WARN, "Cant not find the target link of source link[order={0}]", srcLinkOrder);
return; return;
} }
...@@ -156,7 +156,7 @@ public final class LinkMgmtService { ...@@ -156,7 +156,7 @@ public final class LinkMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Changes link's order failed", e); LOGGER.log(Level.ERROR, "Changes link's order failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -197,7 +197,7 @@ public final class LinkMgmtService { ...@@ -197,7 +197,7 @@ public final class LinkMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Adds a link failed", e); LOGGER.log(Level.ERROR, "Adds a link failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
......
...@@ -17,9 +17,9 @@ package org.b3log.solo.service; ...@@ -17,9 +17,9 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.SortDirection; import org.b3log.latke.repository.SortDirection;
...@@ -106,7 +106,7 @@ public final class LinkQueryService { ...@@ -106,7 +106,7 @@ public final class LinkQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets links failed", e); LOGGER.log(Level.ERROR, "Gets links failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -142,7 +142,7 @@ public final class LinkQueryService { ...@@ -142,7 +142,7 @@ public final class LinkQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets a link failed", e); LOGGER.log(Level.ERROR, "Gets a link failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.b3log.solo.service; package org.b3log.solo.service;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -36,11 +35,6 @@ import org.json.JSONObject; ...@@ -36,11 +35,6 @@ import org.json.JSONObject;
*/ */
public final class OptionMgmtService { public final class OptionMgmtService {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(OptionMgmtService.class.getName());
/** /**
* Option repository. * Option repository.
*/ */
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.b3log.solo.service; package org.b3log.solo.service;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.repository.FilterOperator; import org.b3log.latke.repository.FilterOperator;
import org.b3log.latke.repository.PropertyFilter; import org.b3log.latke.repository.PropertyFilter;
...@@ -39,11 +38,6 @@ import org.json.JSONObject; ...@@ -39,11 +38,6 @@ import org.json.JSONObject;
*/ */
public final class OptionQueryService { public final class OptionQueryService {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(OptionQueryService.class.getName());
/** /**
* Option repository. * Option repository.
*/ */
......
...@@ -17,9 +17,9 @@ package org.b3log.solo.service; ...@@ -17,9 +17,9 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
...@@ -166,9 +166,9 @@ public final class PageMgmtService { ...@@ -166,9 +166,9 @@ public final class PageMgmtService {
transaction.commit(); transaction.commit();
LOGGER.log(Level.FINER, "Updated a page[id={0}]", pageId); LOGGER.log(Level.DEBUG, "Updated a page[id={0}]", pageId);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
...@@ -187,7 +187,7 @@ public final class PageMgmtService { ...@@ -187,7 +187,7 @@ public final class PageMgmtService {
final Transaction transaction = pageRepository.beginTransaction(); final Transaction transaction = pageRepository.beginTransaction();
try { try {
LOGGER.log(Level.FINER, "Removing a page[id={0}]", pageId); LOGGER.log(Level.DEBUG, "Removing a page[id={0}]", pageId);
removePageComments(pageId); removePageComments(pageId);
pageRepository.remove(pageId); pageRepository.remove(pageId);
...@@ -198,7 +198,7 @@ public final class PageMgmtService { ...@@ -198,7 +198,7 @@ public final class PageMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes a page[id=" + pageId + "] failed", e); LOGGER.log(Level.ERROR, "Removes a page[id=" + pageId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -277,14 +277,14 @@ public final class PageMgmtService { ...@@ -277,14 +277,14 @@ public final class PageMgmtService {
return ret; return ret;
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
throw new ServiceException(e); throw new ServiceException(e);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
...@@ -322,7 +322,7 @@ public final class PageMgmtService { ...@@ -322,7 +322,7 @@ public final class PageMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.WARNING, "Cant not find the target page of source page[order={0}]", srcPageOrder); LOGGER.log(Level.WARN, "Cant not find the target page of source page[order={0}]", srcPageOrder);
return; return;
} }
...@@ -339,7 +339,7 @@ public final class PageMgmtService { ...@@ -339,7 +339,7 @@ public final class PageMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Changes page's order failed", e); LOGGER.log(Level.ERROR, "Changes page's order failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -17,9 +17,9 @@ package org.b3log.solo.service; ...@@ -17,9 +17,9 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.SortDirection; import org.b3log.latke.repository.SortDirection;
...@@ -87,7 +87,7 @@ public final class PageQueryService { ...@@ -87,7 +87,7 @@ public final class PageQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -158,7 +158,7 @@ public final class PageQueryService { ...@@ -158,7 +158,7 @@ public final class PageQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets pages failed", e); LOGGER.log(Level.ERROR, "Gets pages failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -18,11 +18,10 @@ package org.b3log.solo.service; ...@@ -18,11 +18,10 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.plugin.AbstractPlugin; import org.b3log.latke.plugin.AbstractPlugin;
import org.b3log.latke.plugin.PluginManager; import org.b3log.latke.plugin.PluginManager;
...@@ -101,7 +100,7 @@ public final class PluginMgmtService { ...@@ -101,7 +100,7 @@ public final class PluginMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Set plugin status error", e); LOGGER.log(Level.ERROR, "Set plugin status error", e);
ret.put(Keys.STATUS_CODE, false); ret.put(Keys.STATUS_CODE, false);
ret.put(Keys.MSG, langs.get("setFailLabel")); ret.put(Keys.MSG, langs.get("setFailLabel"));
...@@ -153,7 +152,7 @@ public final class PluginMgmtService { ...@@ -153,7 +152,7 @@ public final class PluginMgmtService {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Set plugin status error", e); LOGGER.log(Level.ERROR, "Set plugin status error", e);
ret.put(Keys.STATUS_CODE, false); ret.put(Keys.STATUS_CODE, false);
ret.put(Keys.MSG, langs.get("setFailLabel")); ret.put(Keys.MSG, langs.get("setFailLabel"));
......
...@@ -18,9 +18,8 @@ package org.b3log.solo.service; ...@@ -18,9 +18,8 @@ package org.b3log.solo.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.plugin.AbstractPlugin; import org.b3log.latke.plugin.AbstractPlugin;
...@@ -117,7 +116,7 @@ public final class PluginQueryService { ...@@ -117,7 +116,7 @@ public final class PluginQueryService {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Gets plugins failed", e); LOGGER.log(Level.ERROR, "Gets plugins failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -138,13 +137,13 @@ public final class PluginQueryService { ...@@ -138,13 +137,13 @@ public final class PluginQueryService {
try { try {
ret = pluginRepository.get(pluginId); ret = pluginRepository.get(pluginId);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "get plugin[" + pluginId + "] fail"); LOGGER.log(Level.ERROR, "get plugin[" + pluginId + "] fail");
throw new ServiceException("get plugin[" + pluginId + "] fail"); throw new ServiceException("get plugin[" + pluginId + "] fail");
} }
if (ret == null) { if (ret == null) {
LOGGER.log(Level.SEVERE, "can not find plugin[" + pluginId + "]"); LOGGER.log(Level.ERROR, "can not find plugin[" + pluginId + "]");
throw new ServiceException("can not find plugin[" + pluginId + "]"); throw new ServiceException("can not find plugin[" + pluginId + "]");
} }
......
...@@ -25,10 +25,10 @@ import java.io.File; ...@@ -25,10 +25,10 @@ import java.io.File;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeEnv; import org.b3log.latke.RuntimeEnv;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -93,7 +93,7 @@ public final class PreferenceMgmtService { ...@@ -93,7 +93,7 @@ public final class PreferenceMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates reply notification failed", e); LOGGER.log(Level.ERROR, "Updates reply notification failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -141,7 +141,7 @@ public final class PreferenceMgmtService { ...@@ -141,7 +141,7 @@ public final class PreferenceMgmtService {
final String webRootPath = SoloServletListener.getWebRoot(); final String webRootPath = SoloServletListener.getWebRoot();
final String skinPath = webRootPath + Skin.SKINS + "/" + skinDirName; final String skinPath = webRootPath + Skin.SKINS + "/" + skinDirName;
LOGGER.log(Level.FINER, "Skin path[{0}]", skinPath); LOGGER.log(Level.DEBUG, "Skin path[{0}]", skinPath);
Templates.CACHE.clear(); Templates.CACHE.clear();
preference.put(Skin.SKINS, skinArray.toString()); preference.put(Skin.SKINS, skinArray.toString());
...@@ -185,7 +185,7 @@ public final class PreferenceMgmtService { ...@@ -185,7 +185,7 @@ public final class PreferenceMgmtService {
final String localeString = preference.getString(Preference.LOCALE_STRING); final String localeString = preference.getString(Preference.LOCALE_STRING);
LOGGER.log(Level.FINER, "Current locale[string={0}]", localeString); LOGGER.log(Level.DEBUG, "Current locale[string={0}]", localeString);
Latkes.setLocale(new Locale(Locales.getLanguage(localeString), Locales.getCountry(localeString))); Latkes.setLocale(new Locale(Locales.getLanguage(localeString), Locales.getCountry(localeString)));
preferenceRepository.update(Preference.PREFERENCE, preference); preferenceRepository.update(Preference.PREFERENCE, preference);
...@@ -203,23 +203,23 @@ public final class PreferenceMgmtService { ...@@ -203,23 +203,23 @@ public final class PreferenceMgmtService {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates preference failed", e); LOGGER.log(Level.ERROR, "Updates preference failed", e);
throw new ServiceException(langPropsService.get("updateFailLabel")); throw new ServiceException(langPropsService.get("updateFailLabel"));
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates preference failed", e); LOGGER.log(Level.ERROR, "Updates preference failed", e);
throw new ServiceException(langPropsService.get("updateFailLabel")); throw new ServiceException(langPropsService.get("updateFailLabel"));
} catch (final IOException e) { } catch (final IOException e) {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates preference failed", e); LOGGER.log(Level.ERROR, "Updates preference failed", e);
throw new ServiceException(langPropsService.get("updateFailLabel")); throw new ServiceException(langPropsService.get("updateFailLabel"));
} }
LOGGER.log(Level.FINER, "Updates preference successfully"); LOGGER.log(Level.DEBUG, "Updates preference successfully");
} }
/** /**
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
package org.b3log.solo.service; package org.b3log.solo.service;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.solo.model.Preference; import org.b3log.solo.model.Preference;
...@@ -55,7 +55,7 @@ public final class PreferenceQueryService { ...@@ -55,7 +55,7 @@ public final class PreferenceQueryService {
try { try {
return preferenceRepository.get(Preference.REPLY_NOTIFICATION_TEMPLATE); return preferenceRepository.get(Preference.REPLY_NOTIFICATION_TEMPLATE);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Updates reply notification template failed", e); LOGGER.log(Level.ERROR, "Updates reply notification template failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -75,13 +75,13 @@ public final class PreferenceQueryService { ...@@ -75,13 +75,13 @@ public final class PreferenceQueryService {
final JSONObject ret = preferenceRepository.get(Preference.PREFERENCE); final JSONObject ret = preferenceRepository.get(Preference.PREFERENCE);
if (null == ret) { if (null == ret) {
LOGGER.log(Level.WARNING, "Can not load preference from datastore"); LOGGER.log(Level.WARN, "Can not load preference from datastore");
return null; return null;
} }
return ret; return ret;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
......
...@@ -21,10 +21,10 @@ import java.util.HashSet; ...@@ -21,10 +21,10 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
...@@ -138,7 +138,7 @@ public final class StatisticMgmtService { ...@@ -138,7 +138,7 @@ public final class StatisticMgmtService {
continue; continue;
} }
LOGGER.log(Level.FINER, "Updating article[id={0}, title={1}] view count", LOGGER.log(Level.DEBUG, "Updating article[id={0}, title={1}] view count",
new Object[] {articleId, cachedPage.optString(PageCaches.CACHED_TITLE)}); new Object[] {articleId, cachedPage.optString(PageCaches.CACHED_TITLE)});
final int oldViewCount = article.optInt(Article.ARTICLE_VIEW_COUNT); final int oldViewCount = article.optInt(Article.ARTICLE_VIEW_COUNT);
...@@ -152,7 +152,7 @@ public final class StatisticMgmtService { ...@@ -152,7 +152,7 @@ public final class StatisticMgmtService {
cachedPage.put(PageCaches.CACHED_HIT_COUNT, 0); cachedPage.put(PageCaches.CACHED_HIT_COUNT, 0);
LOGGER.log(Level.FINER, "Updating article[id={0}, title={1}] view count from [{2}] to [{3}]", LOGGER.log(Level.DEBUG, "Updating article[id={0}, title={1}] view count from [{2}] to [{3}]",
new Object[] {articleId, article.optString(Article.ARTICLE_TITLE), oldViewCount, viewCount}); new Object[] {articleId, article.optString(Article.ARTICLE_TITLE), oldViewCount, viewCount});
} }
...@@ -164,7 +164,7 @@ public final class StatisticMgmtService { ...@@ -164,7 +164,7 @@ public final class StatisticMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates statistic failed", e); LOGGER.log(Level.ERROR, "Updates statistic failed", e);
} }
} }
...@@ -184,10 +184,10 @@ public final class StatisticMgmtService { ...@@ -184,10 +184,10 @@ public final class StatisticMgmtService {
if (transaction.isActive()) { if (transaction.isActive()) {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates statistic failed", e); LOGGER.log(Level.ERROR, "Updates statistic failed", e);
} }
LOGGER.log(Level.FINER, "Updates statistic successfully"); LOGGER.log(Level.DEBUG, "Updates statistic successfully");
} }
/** /**
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
package org.b3log.solo.service; package org.b3log.solo.service;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.solo.model.Statistic; import org.b3log.solo.model.Statistic;
...@@ -56,13 +56,13 @@ public final class StatisticQueryService { ...@@ -56,13 +56,13 @@ public final class StatisticQueryService {
final JSONObject ret = statisticRepository.get(Statistic.STATISTIC); final JSONObject ret = statisticRepository.get(Statistic.STATISTIC);
if (null == ret) { if (null == ret) {
LOGGER.log(Level.WARNING, "Can not load statistic from repository"); LOGGER.log(Level.WARN, "Can not load statistic from repository");
return null; return null;
} }
return ret; return ret;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
......
...@@ -17,9 +17,9 @@ package org.b3log.solo.service; ...@@ -17,9 +17,9 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.solo.model.Tag; import org.b3log.solo.model.Tag;
...@@ -80,7 +80,7 @@ public final class TagMgmtService { ...@@ -80,7 +80,7 @@ public final class TagMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes unused tags failed", e); LOGGER.log(Level.ERROR, "Removes unused tags failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -17,9 +17,9 @@ package org.b3log.solo.service; ...@@ -17,9 +17,9 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
...@@ -79,11 +79,11 @@ public final class TagQueryService { ...@@ -79,11 +79,11 @@ public final class TagQueryService {
ret.put(Tag.TAG, tag); ret.put(Tag.TAG, tag);
LOGGER.log(Level.FINER, "Got an tag[title={0}]", tagTitle); LOGGER.log(Level.DEBUG, "Got an tag[title={0}]", tagTitle);
return ret; return ret;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets an article failed", e); LOGGER.log(Level.ERROR, "Gets an article failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -98,7 +98,7 @@ public final class TagQueryService { ...@@ -98,7 +98,7 @@ public final class TagQueryService {
try { try {
return tagRepository.count(); return tagRepository.count();
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets tags failed", e); LOGGER.log(Level.ERROR, "Gets tags failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -125,7 +125,7 @@ public final class TagQueryService { ...@@ -125,7 +125,7 @@ public final class TagQueryService {
return CollectionUtils.jsonArrayToList(tagArray); return CollectionUtils.jsonArrayToList(tagArray);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets tags failed", e); LOGGER.log(Level.ERROR, "Gets tags failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
package org.b3log.solo.service; package org.b3log.solo.service;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
...@@ -136,7 +136,7 @@ public final class UserMgmtService { ...@@ -136,7 +136,7 @@ public final class UserMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates a user failed", e); LOGGER.log(Level.ERROR, "Updates a user failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -173,7 +173,7 @@ public final class UserMgmtService { ...@@ -173,7 +173,7 @@ public final class UserMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates a user failed", e); LOGGER.log(Level.ERROR, "Updates a user failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -249,7 +249,7 @@ public final class UserMgmtService { ...@@ -249,7 +249,7 @@ public final class UserMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Adds a user failed", e); LOGGER.log(Level.ERROR, "Adds a user failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -272,7 +272,7 @@ public final class UserMgmtService { ...@@ -272,7 +272,7 @@ public final class UserMgmtService {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Removes a user[id=" + userId + "] failed", e); LOGGER.log(Level.ERROR, "Removes a user[id=" + userId + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
......
...@@ -17,9 +17,9 @@ package org.b3log.solo.service; ...@@ -17,9 +17,9 @@ package org.b3log.solo.service;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
...@@ -68,7 +68,7 @@ public final class UserQueryService { ...@@ -68,7 +68,7 @@ public final class UserQueryService {
try { try {
return userRepository.getAdmin(); return userRepository.getAdmin();
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets admin failed", e); LOGGER.log(Level.ERROR, "Gets admin failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -84,7 +84,7 @@ public final class UserQueryService { ...@@ -84,7 +84,7 @@ public final class UserQueryService {
try { try {
return userRepository.getByEmail(email); return userRepository.getByEmail(email);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets user by email[" + email + "] failed", e); LOGGER.log(Level.ERROR, "Gets user by email[" + email + "] failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -132,7 +132,7 @@ public final class UserQueryService { ...@@ -132,7 +132,7 @@ public final class UserQueryService {
try { try {
result = userRepository.get(query); result = userRepository.get(query);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets users failed", e); LOGGER.log(Level.ERROR, "Gets users failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -179,7 +179,7 @@ public final class UserQueryService { ...@@ -179,7 +179,7 @@ public final class UserQueryService {
try { try {
user = userRepository.get(userId); user = userRepository.get(userId);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets a user failed", e); LOGGER.log(Level.ERROR, "Gets a user failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
......
...@@ -20,11 +20,11 @@ import java.util.Date; ...@@ -20,11 +20,11 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.user.UserService; import org.b3log.latke.user.UserService;
...@@ -134,7 +134,7 @@ public final class Articles { ...@@ -134,7 +134,7 @@ public final class Articles {
return ((Date) recentArticle.get(Article.ARTICLE_UPDATE_DATE)).getTime(); return ((Date) recentArticle.get(Article.ARTICLE_UPDATE_DATE)).getTime();
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
throw new ServiceException("Gets recent article time failed"); throw new ServiceException("Gets recent article time failed");
} }
} }
...@@ -164,7 +164,7 @@ public final class Articles { ...@@ -164,7 +164,7 @@ public final class Articles {
JSONObject ret = userRepository.getByEmail(email); JSONObject ret = userRepository.getByEmail(email);
if (null == ret) { if (null == ret) {
LOGGER.log(Level.WARNING, "Gets author of article failed, assumes the administrator is the author of this article[id={0}]", LOGGER.log(Level.WARN, "Gets author of article failed, assumes the administrator is the author of this article[id={0}]",
article.getString(Keys.OBJECT_ID)); article.getString(Keys.OBJECT_ID));
// This author may be deleted by admin, use admin as the author // This author may be deleted by admin, use admin as the author
// of this article // of this article
...@@ -173,10 +173,10 @@ public final class Articles { ...@@ -173,10 +173,10 @@ public final class Articles {
return ret; return ret;
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets author of article[id={0}] failed", article.optString(Keys.OBJECT_ID)); LOGGER.log(Level.ERROR, "Gets author of article[id={0}] failed", article.optString(Keys.OBJECT_ID));
throw new ServiceException(e); throw new ServiceException(e);
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.SEVERE, "Gets author of article[id={0}] failed", article.optString(Keys.OBJECT_ID)); LOGGER.log(Level.ERROR, "Gets author of article[id={0}] failed", article.optString(Keys.OBJECT_ID));
throw new ServiceException(e); throw new ServiceException(e);
} }
} }
...@@ -224,7 +224,7 @@ public final class Articles { ...@@ -224,7 +224,7 @@ public final class Articles {
} }
} }
LOGGER.log(Level.WARNING, "Can not find the sign[id={0}], returns a default sign[id=1]", signId); LOGGER.log(Level.WARN, "Can not find the sign[id={0}], returns a default sign[id=1]", signId);
if (null == defaultSign) { if (null == defaultSign) {
throw new IllegalStateException("Can not find the default sign which id equals to 1"); throw new IllegalStateException("Can not find the default sign which id equals to 1");
} }
......
...@@ -17,10 +17,10 @@ package org.b3log.solo.util; ...@@ -17,10 +17,10 @@ package org.b3log.solo.util;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.mail.MailService; import org.b3log.latke.mail.MailService;
import org.b3log.latke.mail.MailService.Message; import org.b3log.latke.mail.MailService.Message;
import org.b3log.latke.mail.MailServiceFactory; import org.b3log.latke.mail.MailServiceFactory;
...@@ -187,7 +187,7 @@ public final class Comments { ...@@ -187,7 +187,7 @@ public final class Comments {
final String commentName = requestJSONObject.getString(Comment.COMMENT_NAME); final String commentName = requestJSONObject.getString(Comment.COMMENT_NAME);
if (MAX_COMMENT_NAME_LENGTH < commentName.length() || MIN_COMMENT_NAME_LENGTH > commentName.length()) { if (MAX_COMMENT_NAME_LENGTH < commentName.length() || MIN_COMMENT_NAME_LENGTH > commentName.length()) {
LOGGER.log(Level.WARNING, "Comment name is too long[{0}]", commentName); LOGGER.log(Level.WARN, "Comment name is too long[{0}]", commentName);
ret.put(Keys.MSG, langPropsService.get("nameTooLongLabel")); ret.put(Keys.MSG, langPropsService.get("nameTooLongLabel"));
return ret; return ret;
...@@ -196,7 +196,7 @@ public final class Comments { ...@@ -196,7 +196,7 @@ public final class Comments {
final String commentEmail = requestJSONObject.getString(Comment.COMMENT_EMAIL).trim().toLowerCase(); final String commentEmail = requestJSONObject.getString(Comment.COMMENT_EMAIL).trim().toLowerCase();
if (!Strings.isEmail(commentEmail)) { if (!Strings.isEmail(commentEmail)) {
LOGGER.log(Level.WARNING, "Comment email is invalid[{0}]", commentEmail); LOGGER.log(Level.WARN, "Comment email is invalid[{0}]", commentEmail);
ret.put(Keys.MSG, langPropsService.get("mailInvalidLabel")); ret.put(Keys.MSG, langPropsService.get("mailInvalidLabel"));
return ret; return ret;
...@@ -205,7 +205,7 @@ public final class Comments { ...@@ -205,7 +205,7 @@ public final class Comments {
final String commentURL = requestJSONObject.optString(Comment.COMMENT_URL); final String commentURL = requestJSONObject.optString(Comment.COMMENT_URL);
if (!Strings.isURL(commentURL)) { if (!Strings.isURL(commentURL)) {
LOGGER.log(Level.WARNING, "Comment URL is invalid[{0}]", commentURL); LOGGER.log(Level.WARN, "Comment URL is invalid[{0}]", commentURL);
ret.put(Keys.MSG, langPropsService.get("urlInvalidLabel")); ret.put(Keys.MSG, langPropsService.get("urlInvalidLabel"));
return ret; return ret;
...@@ -215,7 +215,7 @@ public final class Comments { ...@@ -215,7 +215,7 @@ public final class Comments {
SoloServletListener.ENTER_ESC); SoloServletListener.ENTER_ESC);
if (MAX_COMMENT_CONTENT_LENGTH < commentContent.length() || MIN_COMMENT_CONTENT_LENGTH > commentContent.length()) { if (MAX_COMMENT_CONTENT_LENGTH < commentContent.length() || MIN_COMMENT_CONTENT_LENGTH > commentContent.length()) {
LOGGER.log(Level.WARNING, "Comment conent length is invalid[{0}]", commentContent.length()); LOGGER.log(Level.WARN, "Comment conent length is invalid[{0}]", commentContent.length());
ret.put(Keys.MSG, langPropsService.get("commentContentCannotEmptyLabel")); ret.put(Keys.MSG, langPropsService.get("commentContentCannotEmptyLabel"));
return ret; return ret;
...@@ -225,7 +225,7 @@ public final class Comments { ...@@ -225,7 +225,7 @@ public final class Comments {
return ret; return ret;
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.WARNING, "Checks add comment request[" + requestJSONObject.toString() + "] failed", e); LOGGER.log(Level.WARN, "Checks add comment request[" + requestJSONObject.toString() + "] failed", e);
ret.put(Keys.STATUS_CODE, false); ret.put(Keys.STATUS_CODE, false);
ret.put(Keys.MSG, langPropsService.get("addFailLabel")); ret.put(Keys.MSG, langPropsService.get("addFailLabel"));
...@@ -258,7 +258,7 @@ public final class Comments { ...@@ -258,7 +258,7 @@ public final class Comments {
final String adminEmail = preference.getString(Preference.ADMIN_EMAIL); final String adminEmail = preference.getString(Preference.ADMIN_EMAIL);
if (adminEmail.equalsIgnoreCase(commentEmail)) { if (adminEmail.equalsIgnoreCase(commentEmail)) {
LOGGER.log(Level.FINER, "Do not send comment notification mail to admin itself[{0}]", adminEmail); LOGGER.log(Level.DEBUG, "Do not send comment notification mail to admin itself[{0}]", adminEmail);
return; return;
} }
...@@ -266,7 +266,7 @@ public final class Comments { ...@@ -266,7 +266,7 @@ public final class Comments {
final String originalEmail = originalComment.getString(Comment.COMMENT_EMAIL); final String originalEmail = originalComment.getString(Comment.COMMENT_EMAIL);
if (originalEmail.equalsIgnoreCase(adminEmail)) { if (originalEmail.equalsIgnoreCase(adminEmail)) {
LOGGER.log(Level.FINER, "Do not send comment notification mail to admin while the specified comment[{0}] is an reply", LOGGER.log(Level.DEBUG, "Do not send comment notification mail to admin while the specified comment[{0}] is an reply",
commentId); commentId);
return; return;
} }
...@@ -315,7 +315,7 @@ public final class Comments { ...@@ -315,7 +315,7 @@ public final class Comments {
"{commenter}", commenter); "{commenter}", commenter);
message.setHtmlBody(mailBody); message.setHtmlBody(mailBody);
LOGGER.log(Level.FINER, "Sending a mail[mailSubject={0}, mailBody=[{1}] to admin[email={2}]", LOGGER.log(Level.DEBUG, "Sending a mail[mailSubject={0}, mailBody=[{1}] to admin[email={2}]",
new Object[] {mailSubject, mailBody, adminEmail}); new Object[] {mailSubject, mailBody, adminEmail});
MAIL_SVC.send(message); MAIL_SVC.send(message);
} }
......
...@@ -18,8 +18,8 @@ package org.b3log.solo.util; ...@@ -18,8 +18,8 @@ package org.b3log.solo.util;
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.logging.Level; import org.b3log.latke.logging.Level;
import java.util.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.tautua.markdownpapers.Markdown; import org.tautua.markdownpapers.Markdown;
import org.tautua.markdownpapers.parser.ParseException; import org.tautua.markdownpapers.parser.ParseException;
...@@ -59,7 +59,7 @@ public final class Markdowns { ...@@ -59,7 +59,7 @@ public final class Markdowns {
try { try {
markdown.transform(new StringReader(markdownText), writer); markdown.transform(new StringReader(markdownText), writer);
} catch (final ParseException e) { } catch (final ParseException e) {
LOGGER.log(Level.SEVERE, "Markdown error", e); LOGGER.log(Level.ERROR, "Markdown error", e);
return "Markdown error"; return "Markdown error";
} }
......
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
package org.b3log.solo.util; package org.b3log.solo.util;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.b3log.solo.repository.ArticleRepository; import org.b3log.solo.repository.ArticleRepository;
...@@ -217,7 +217,7 @@ public final class Permalinks { ...@@ -217,7 +217,7 @@ public final class Permalinks {
return isReservedLink(permalink) || null != articleRepository.getByPermalink(permalink) return isReservedLink(permalink) || null != articleRepository.getByPermalink(permalink)
|| null != pageRepository.getByPermalink(permalink) || permalink.endsWith(".ftl"); || null != pageRepository.getByPermalink(permalink) || permalink.endsWith(".ftl");
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Determines whether the permalink[" + permalink + "] exists failed, returns true", e); LOGGER.log(Level.ERROR, "Determines whether the permalink[" + permalink + "] exists failed, returns true", e);
return true; return true;
} }
......
...@@ -17,11 +17,10 @@ package org.b3log.solo.util; ...@@ -17,11 +17,10 @@ package org.b3log.solo.util;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.plugin.AbstractPlugin; import org.b3log.latke.plugin.AbstractPlugin;
import org.b3log.latke.plugin.PluginStatus; import org.b3log.latke.plugin.PluginStatus;
...@@ -84,7 +83,7 @@ public final class Plugins { ...@@ -84,7 +83,7 @@ public final class Plugins {
plugin.setSetting(new JSONObject(setting)); plugin.setSetting(new JSONObject(setting));
} }
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.WARNING, "the formatter of the old config failed to convert to json", e); LOGGER.log(Level.WARN, "the formatter of the old config failed to convert to json", e);
} }
} }
} }
...@@ -95,11 +94,11 @@ public final class Plugins { ...@@ -95,11 +94,11 @@ public final class Plugins {
PLUGIN_REPOS.add(pluginDesc); PLUGIN_REPOS.add(pluginDesc);
LOGGER.log(Level.FINEST, "Refreshed plugin[{0}]", pluginDesc); LOGGER.log(Level.TRACE, "Refreshed plugin[{0}]", pluginDesc);
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Refresh plugins failed", e); LOGGER.log(Level.ERROR, "Refresh plugins failed", e);
} }
PLUGIN_REPOS.setCacheEnabled(true); PLUGIN_REPOS.setCacheEnabled(true);
......
...@@ -25,11 +25,11 @@ import java.util.HashSet; ...@@ -25,11 +25,11 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.cache.PageCaches; import org.b3log.latke.cache.PageCaches;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.util.Locales; import org.b3log.latke.util.Locales;
import org.b3log.latke.util.Stopwatchs; import org.b3log.latke.util.Stopwatchs;
...@@ -113,7 +113,7 @@ public final class Skins { ...@@ -113,7 +113,7 @@ public final class Skins {
dataModel.putAll(langs); dataModel.putAll(langs);
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.log(Level.SEVERE, "Fills skin langs failed", e); LOGGER.log(Level.ERROR, "Fills skin langs failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} finally { } finally {
Stopwatchs.end(); Stopwatchs.end();
...@@ -139,7 +139,7 @@ public final class Skins { ...@@ -139,7 +139,7 @@ public final class Skins {
final Set<String> skinDirNames = getSkinDirNames(); final Set<String> skinDirNames = getSkinDirNames();
LOGGER.log(Level.FINER, "Loaded skins[dirNames={0}]", skinDirNames); LOGGER.log(Level.DEBUG, "Loaded skins[dirNames={0}]", skinDirNames);
final JSONArray skinArray = new JSONArray(); final JSONArray skinArray = new JSONArray();
for (final String dirName : skinDirNames) { for (final String dirName : skinDirNames) {
...@@ -147,7 +147,7 @@ public final class Skins { ...@@ -147,7 +147,7 @@ public final class Skins {
final String name = getSkinName(dirName); final String name = getSkinName(dirName);
if (null == name) { if (null == name) {
LOGGER.log(Level.WARNING, "The directory[{0}] does not contain any skin, ignored it", dirName); LOGGER.log(Level.WARN, "The directory[{0}] does not contain any skin, ignored it", dirName);
continue; continue;
} }
...@@ -163,10 +163,10 @@ public final class Skins { ...@@ -163,10 +163,10 @@ public final class Skins {
LOGGER.log(Level.INFO, "Current skin[name={0}]", skinName); LOGGER.log(Level.INFO, "Current skin[name={0}]", skinName);
if (!skinDirNames.contains(currentSkinDirName)) { if (!skinDirNames.contains(currentSkinDirName)) {
LOGGER.log(Level.WARNING, "Configred skin[dirName={0}] can not find, try to use " + "default skin[dirName=ease] instead.", LOGGER.log(Level.WARN, "Configred skin[dirName={0}] can not find, try to use " + "default skin[dirName=ease] instead.",
currentSkinDirName); currentSkinDirName);
if (!skinDirNames.contains("ease")) { if (!skinDirNames.contains("ease")) {
LOGGER.log(Level.SEVERE, "Can not find skin[dirName=ease]"); LOGGER.log(Level.ERROR, "Can not find skin[dirName=ease]");
throw new IllegalStateException( throw new IllegalStateException(
"Can not find default skin[dirName=ease], please redeploy your B3log Solo and make sure " "Can not find default skin[dirName=ease], please redeploy your B3log Solo and make sure "
...@@ -223,7 +223,7 @@ public final class Skins { ...@@ -223,7 +223,7 @@ public final class Skins {
Templates.MOBILE_CFG.setDirectoryForTemplateLoading(new File(webRootPath + SKINS + File.separator + "mobile")); Templates.MOBILE_CFG.setDirectoryForTemplateLoading(new File(webRootPath + SKINS + File.separator + "mobile"));
} catch (final IOException e) { } catch (final IOException e) {
LOGGER.log(Level.SEVERE, "Loads skins error!", e); LOGGER.log(Level.ERROR, "Loads skins error!", e);
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
...@@ -257,7 +257,7 @@ public final class Skins { ...@@ -257,7 +257,7 @@ public final class Skins {
final Set<String> ret = new HashSet<String>(); final Set<String> ret = new HashSet<String>();
if (null == skinDirs) { if (null == skinDirs) {
LOGGER.severe("Skin directory is null"); LOGGER.error("Skin directory is null");
return ret; return ret;
} }
...@@ -292,13 +292,13 @@ public final class Skins { ...@@ -292,13 +292,13 @@ public final class Skins {
}); });
if (null == skinDirs) { if (null == skinDirs) {
LOGGER.severe("Skin directory is null"); LOGGER.error("Skin directory is null");
return null; return null;
} }
if (1 != skinDirs.length) { if (1 != skinDirs.length) {
LOGGER.log(Level.SEVERE, "Skin directory count[{0}]", skinDirs.length); LOGGER.log(Level.ERROR, "Skin directory count[{0}]", skinDirs.length);
return null; return null;
} }
...@@ -311,7 +311,7 @@ public final class Skins { ...@@ -311,7 +311,7 @@ public final class Skins {
return ret.getProperty("name"); return ret.getProperty("name");
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "Read skin configuration error[msg={0}]", e.getMessage()); LOGGER.log(Level.ERROR, "Read skin configuration error[msg={0}]", e.getMessage());
return null; return null;
} }
......
...@@ -20,11 +20,11 @@ import java.util.HashMap; ...@@ -20,11 +20,11 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
...@@ -94,10 +94,10 @@ public final class Statistics { ...@@ -94,10 +94,10 @@ public final class Statistics {
public static void onlineVisitorCount(final HttpServletRequest request) { public static void onlineVisitorCount(final HttpServletRequest request) {
final String remoteAddr = Requests.getRemoteAddr(request); final String remoteAddr = Requests.getRemoteAddr(request);
LOGGER.log(Level.FINER, "Current request [IP={0}]", remoteAddr); LOGGER.log(Level.DEBUG, "Current request [IP={0}]", remoteAddr);
ONLINE_VISITORS.put(remoteAddr, System.currentTimeMillis()); ONLINE_VISITORS.put(remoteAddr, System.currentTimeMillis());
LOGGER.log(Level.FINER, "Current online visitor count [{0}]", ONLINE_VISITORS.size()); LOGGER.log(Level.DEBUG, "Current online visitor count [{0}]", ONLINE_VISITORS.size());
} }
/** /**
...@@ -113,11 +113,11 @@ public final class Statistics { ...@@ -113,11 +113,11 @@ public final class Statistics {
if (currentTimeMillis > (onlineVisitor.getValue() + ONLINE_VISITOR_EXPIRATION)) { if (currentTimeMillis > (onlineVisitor.getValue() + ONLINE_VISITOR_EXPIRATION)) {
iterator.remove(); iterator.remove();
LOGGER.log(Level.FINEST, "Removed online visitor[ip={0}]", onlineVisitor.getKey()); LOGGER.log(Level.TRACE, "Removed online visitor[ip={0}]", onlineVisitor.getKey());
} }
} }
LOGGER.log(Level.FINER, "Current online visitor count [{0}]", ONLINE_VISITORS.size()); LOGGER.log(Level.DEBUG, "Current online visitor count [{0}]", ONLINE_VISITORS.size());
} }
/** /**
...@@ -257,7 +257,7 @@ public final class Statistics { ...@@ -257,7 +257,7 @@ public final class Statistics {
return; return;
} }
LOGGER.log(Level.FINEST, "Before inc blog view count[statistic={0}]", statistic); LOGGER.log(Level.TRACE, "Before inc blog view count[statistic={0}]", statistic);
int blogViewCnt = statistic.getInt(Statistic.STATISTIC_BLOG_VIEW_COUNT); int blogViewCnt = statistic.getInt(Statistic.STATISTIC_BLOG_VIEW_COUNT);
...@@ -276,14 +276,14 @@ public final class Statistics { ...@@ -276,14 +276,14 @@ public final class Statistics {
transaction.rollback(); transaction.rollback();
} }
LOGGER.log(Level.SEVERE, "Updates blog view count failed", e); LOGGER.log(Level.ERROR, "Updates blog view count failed", e);
} }
} else { } else {
// Repository cache prefix, Refers to GAERepository#CACHE_KEY_PREFIX // Repository cache prefix, Refers to GAERepository#CACHE_KEY_PREFIX
statisticRepository.getCache().putAsync(REPOSITORY_CACHE_KEY_PREFIX + Statistic.STATISTIC, statistic); statisticRepository.getCache().putAsync(REPOSITORY_CACHE_KEY_PREFIX + Statistic.STATISTIC, statistic);
} }
LOGGER.log(Level.FINER, "Inced blog view count[statistic={0}]", statistic); LOGGER.log(Level.DEBUG, "Inced blog view count[statistic={0}]", statistic);
} }
/** /**
......
...@@ -18,7 +18,6 @@ package org.b3log.solo.util; ...@@ -18,7 +18,6 @@ package org.b3log.solo.util;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.b3log.solo.model.Tag; import org.b3log.solo.model.Tag;
import org.b3log.solo.repository.TagRepository; import org.b3log.solo.repository.TagRepository;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
...@@ -36,11 +35,6 @@ import org.json.JSONObject; ...@@ -36,11 +35,6 @@ import org.json.JSONObject;
*/ */
public final class Tags { public final class Tags {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(Tags.class.getName());
/** /**
* Tag repository. * Tag repository.
*/ */
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
package org.b3log.solo.util; package org.b3log.solo.util;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
...@@ -85,11 +85,11 @@ public final class Users { ...@@ -85,11 +85,11 @@ public final class Users {
return 1 != users.length(); return 1 != users.length();
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Determines multiple users failed", e); LOGGER.log(Level.ERROR, "Determines multiple users failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} catch (final JSONException e) { } catch (final JSONException e) {
LOGGER.log(Level.SEVERE, "Determines multiple users failed", e); LOGGER.log(Level.ERROR, "Determines multiple users failed", e);
throw new ServiceException(e); throw new ServiceException(e);
} }
...@@ -178,7 +178,7 @@ public final class Users { ...@@ -178,7 +178,7 @@ public final class Users {
try { try {
return userRepository.getByEmail(email); return userRepository.getByEmail(email);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.SEVERE, "Gets current user by request failed, returns null", e); LOGGER.log(Level.ERROR, "Gets current user by request failed, returns null", e);
return null; return null;
} }
...@@ -199,7 +199,7 @@ public final class Users { ...@@ -199,7 +199,7 @@ public final class Users {
return existEmail(email, users); return existEmail(email, users);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
return false; return false;
} }
} }
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: B3log Solo parent POM. Description: B3log Solo parent POM.
Version: 2.0.2.9, Mar 12, 2013 Version: 2.0.3.0, Jun 18, 2013
Author: Liang Ding Author: Liang Ding
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<!-- Properties --> <!-- Properties -->
<properties> <properties>
<servlet.version>2.5</servlet.version> <servlet.version>2.5</servlet.version>
<slf4j.version>1.7.5</slf4j.version>
<org.b3log.solo.version>0.6.0</org.b3log.solo.version> <org.b3log.solo.version>0.6.0</org.b3log.solo.version>
<org.b3log.latke.version>0.5.0-SNAPSHOT</org.b3log.latke.version> <org.b3log.latke.version>0.5.0-SNAPSHOT</org.b3log.latke.version>
<org.b3log.latke-gae.version>0.5.0-SNAPSHOT</org.b3log.latke-gae.version> <org.b3log.latke-gae.version>0.5.0-SNAPSHOT</org.b3log.latke-gae.version>
...@@ -208,11 +209,11 @@ ...@@ -208,11 +209,11 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- <dependency> <dependency>
<groupId>com.google.api.client</groupId> <groupId>org.slf4j</groupId>
<artifactId>google-api-client</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>${com.google.api.client.version}</version> <version>${slf4j.version}</version>
</dependency>--> </dependency>
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
......
...@@ -124,7 +124,6 @@ ...@@ -124,7 +124,6 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
......
...@@ -76,6 +76,24 @@ ...@@ -76,6 +76,24 @@
<artifactId>latke-gae</artifactId> <artifactId>latke-gae</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.b3log</groupId>
<artifactId>solo-core</artifactId>
<exclusions>
<!-- Logging -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
...@@ -146,7 +164,10 @@ ...@@ -146,7 +164,10 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <excludes>
<!-- GAE uses JDK logger -->
<exclude>log4j.properties</exclude>
</excludes>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
......
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
# #
# #
# Description: B3log Solo JDK logging configurations. Add the following to # Description: B3log Solo JDK logging configurations. Add the following to appengine-web.xml:
# appengine-web.xml:
# <system-properties> # <system-properties>
# <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties"/> # <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties"/>
# </system-properties> # </system-properties>
...@@ -25,10 +24,6 @@ ...@@ -25,10 +24,6 @@
# #
handlers=java.util.logging.ConsoleHandler handlers=java.util.logging.ConsoleHandler
# XXX: java.util.logging.ConsoleHandler.encoding=UTF-8
# FIXME: formatter does not work, issue 59
#java.util.logging.ConsoleHandler.formatter=org.b3log.latke.logging.LatkeFormatter
#org.b3log.latke.logging.LatkeFormatter.format=%L: %m [%C.%M]
org.b3log.solo.level=INFO org.b3log.solo.level=INFO
......
...@@ -105,7 +105,6 @@ ...@@ -105,7 +105,6 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
......
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment