Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo
Commits
c3c468ae
Commit
c3c468ae
authored
Oct 31, 2015
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更友好的日志级别与文案
parent
469846dd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
24 deletions
+47
-24
src/main/java/org/b3log/solo/SoloServletListener.java
src/main/java/org/b3log/solo/SoloServletListener.java
+7
-6
src/main/java/org/b3log/solo/Starter.java
src/main/java/org/b3log/solo/Starter.java
+23
-4
src/main/java/org/b3log/solo/processor/CaptchaProcessor.java
src/main/java/org/b3log/solo/processor/CaptchaProcessor.java
+3
-3
src/main/java/org/b3log/solo/service/PreferenceMgmtService.java
...in/java/org/b3log/solo/service/PreferenceMgmtService.java
+5
-5
src/main/java/org/b3log/solo/util/Skins.java
src/main/java/org/b3log/solo/util/Skins.java
+3
-3
src/main/resources/log4j.properties
src/main/resources/log4j.properties
+6
-3
No files found.
src/main/java/org/b3log/solo/SoloServletListener.java
View file @
c3c468ae
...
...
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpSession
;
import
javax.servlet.http.HttpSessionEvent
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Latkes
;
import
org.b3log.latke.event.EventManager
;
import
org.b3log.latke.ioc.LatkeBeanManager
;
import
org.b3log.latke.ioc.Lifecycle
;
...
...
@@ -53,7 +54,7 @@ import org.json.JSONObject;
* Solo Servlet listener.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.5.0.
8, Oct 17
, 2015
* @version 1.5.0.
9, Oct 31
, 2015
* @since 0.3.1
*/
public
final
class
SoloServletListener
extends
AbstractServletListener
{
...
...
@@ -139,7 +140,7 @@ public final class SoloServletListener extends AbstractServletListener {
pluginManager
.
load
();
LOGGER
.
info
(
"
Initialized the context
"
);
LOGGER
.
info
(
"
Solo is running ["
+
Latkes
.
getServePath
()
+
"]
"
);
Stopwatchs
.
end
();
LOGGER
.
log
(
Level
.
DEBUG
,
"Stopwatch: {0}{1}"
,
Strings
.
LINE_SEPARATOR
,
Stopwatchs
.
getTimingStat
());
...
...
@@ -210,7 +211,7 @@ public final class SoloServletListener extends AbstractServletListener {
private
void
loadPreference
()
{
Stopwatchs
.
start
(
"Load Preference"
);
LOGGER
.
info
(
"Loading preference...."
);
LOGGER
.
debug
(
"Loading preference...."
);
final
PreferenceRepository
preferenceRepository
=
beanManager
.
getReference
(
PreferenceRepositoryImpl
.
class
);
JSONObject
preference
;
...
...
@@ -218,7 +219,7 @@ public final class SoloServletListener extends AbstractServletListener {
try
{
preference
=
preferenceRepository
.
get
(
Preference
.
PREFERENCE
);
if
(
null
==
preference
)
{
LOGGER
.
log
(
Level
.
WARN
,
"Can't not init default skin, please init Solo first"
);
LOGGER
.
warn
(
"Can't not init default skin, please init Solo first"
);
return
;
}
...
...
@@ -240,7 +241,7 @@ public final class SoloServletListener extends AbstractServletListener {
private
void
registerEventProcessor
()
{
Stopwatchs
.
start
(
"Register Event Processors"
);
LOGGER
.
log
(
Level
.
INFO
,
"Registering event processors...."
);
LOGGER
.
debug
(
"Registering event processors...."
);
try
{
final
EventManager
eventManager
=
beanManager
.
getReference
(
EventManager
.
class
);
...
...
@@ -264,7 +265,7 @@ public final class SoloServletListener extends AbstractServletListener {
throw
new
IllegalStateException
(
e
);
}
LOGGER
.
log
(
Level
.
INFO
,
"Registering event processors...."
);
LOGGER
.
debug
(
"Registering event processors...."
);
Stopwatchs
.
end
();
}
...
...
src/main/java/org/b3log/solo/Starter.java
View file @
c3c468ae
...
...
@@ -19,23 +19,35 @@ import java.awt.Desktop;
import
java.io.File
;
import
java.net.URI
;
import
java.util.ResourceBundle
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.util.Strings
;
import
org.eclipse.jetty.server.Server
;
import
org.eclipse.jetty.util.log.Log
;
import
org.eclipse.jetty.util.log.Slf4jLog
;
import
org.eclipse.jetty.webapp.WebAppContext
;
/**
* Solo with embedded Jetty, <a href="https://github.com/b3log/solo/issues/12037">standalone mode</a>.
*
* <ul>
* <li>Windows: java -cp WEB-INF/lib/*;WEB-INF/classes org.b3log.solo.S
olo
</li>
* <li>Unix-like: java -cp WEB-INF/lib/*:WEB-INF/classes org.b3log.solo.S
olo
</li>
* <li>Windows: java -cp WEB-INF/lib/*;WEB-INF/classes org.b3log.solo.S
tarter
</li>
* <li>Unix-like: java -cp WEB-INF/lib/*:WEB-INF/classes org.b3log.solo.S
tarter
</li>
* </ul>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.
1
, Oct 31, 2015
* @version 1.0.0.
2
, Oct 31, 2015
* @since 1.2.0
*/
public
final
class
Starter
{
static
{
try
{
Log
.
setLog
(
new
Slf4jLog
());
}
catch
(
final
Exception
e
)
{
e
.
printStackTrace
();
}
}
/**
* Main.
*
...
...
@@ -43,6 +55,10 @@ public final class Starter {
* @throws java.lang.Exception if start failed
*/
public
static
void
main
(
final
String
[]
args
)
throws
Exception
{
final
Logger
logger
=
Logger
.
getLogger
(
Starter
.
class
);
logger
.
info
(
"Standalone mode, see [https://github.com/b3log/solo/wiki/standalone_mode] for more details."
);
String
webappDirLocation
=
"src/main/webapp/"
;
// POM structure in dev env
final
File
file
=
new
File
(
webappDirLocation
);
...
...
@@ -53,7 +69,10 @@ public final class Starter {
final
ResourceBundle
latke
=
ResourceBundle
.
getBundle
(
"latke"
);
final
int
port
=
Integer
.
valueOf
(
latke
.
getString
(
"serverPort"
));
final
String
contextPath
=
latke
.
getString
(
"contextPath"
);
String
contextPath
=
latke
.
getString
(
"contextPath"
);
if
(
Strings
.
isEmptyOrNull
(
contextPath
))
{
contextPath
=
"/"
;
}
Server
server
=
new
Server
(
port
);
WebAppContext
root
=
new
WebAppContext
();
...
...
src/main/java/org/b3log/solo/processor/CaptchaProcessor.java
View file @
c3c468ae
...
...
@@ -54,7 +54,7 @@ import org.b3log.solo.SoloServletListener;
* </p>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.
3, Jan 4, 2013
* @version 1.1.0.
4, Oct 31, 2015
* @since 0.3.1
*/
@RequestProcessor
...
...
@@ -130,7 +130,7 @@ public class CaptchaProcessor {
* Loads captcha.
*/
private
synchronized
void
loadCaptchas
()
{
LOGGER
.
info
(
"Loading captchas...."
);
LOGGER
.
debug
(
"Loading captchas...."
);
try
{
captchas
=
new
Image
[
CAPTCHA_COUNT
];
...
...
@@ -182,6 +182,6 @@ public class CaptchaProcessor {
throw
new
IllegalStateException
(
e
);
}
LOGGER
.
info
(
"Loaded captch images"
);
LOGGER
.
debug
(
"Loaded captch images"
);
}
}
src/main/java/org/b3log/solo/service/PreferenceMgmtService.java
View file @
c3c468ae
...
...
@@ -50,7 +50,7 @@ import static org.b3log.solo.util.Skins.setDirectoryForTemplateLoading;
* Preference management service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.
8, Jun 18, 2014
* @version 1.0.1.
9, Oct 31, 2015
* @since 0.4.0
*/
@Service
...
...
@@ -86,7 +86,7 @@ public class PreferenceMgmtService {
public
void
loadSkins
(
final
JSONObject
preference
)
throws
Exception
{
Stopwatchs
.
start
(
"Load Skins"
);
LOGGER
.
info
(
"Loading skins...."
);
LOGGER
.
debug
(
"Loading skins...."
);
final
Set
<
String
>
skinDirNames
=
getSkinDirNames
();
...
...
@@ -112,7 +112,7 @@ public class PreferenceMgmtService {
final
String
currentSkinDirName
=
preference
.
optString
(
SKIN_DIR_NAME
);
final
String
skinName
=
preference
.
optString
(
SKIN_NAME
);
LOGGER
.
log
(
Level
.
INFO
,
"Current skin[name={0}]"
,
skinName
);
LOGGER
.
log
(
Level
.
DEBUG
,
"Current skin[name={0}]"
,
skinName
);
if
(!
skinDirNames
.
contains
(
currentSkinDirName
))
{
LOGGER
.
log
(
Level
.
WARN
,
"Configred skin[dirName={0}] can not find, try to use "
+
"default skin[dirName="
...
...
@@ -135,7 +135,7 @@ public class PreferenceMgmtService {
final
String
skinsString
=
skinArray
.
toString
();
if
(!
skinsString
.
equals
(
preference
.
getString
(
SKINS
)))
{
LOGGER
.
log
(
Level
.
INFO
,
"The skins directory has been changed, persists "
+
"
the change into preference"
);
LOGGER
.
debug
(
"The skins directory has been changed, persists
the change into preference"
);
preference
.
put
(
SKINS
,
skinsString
);
updatePreference
(
preference
);
}
...
...
@@ -148,7 +148,7 @@ public class PreferenceMgmtService {
TimeZones
.
setTimeZone
(
"Asia/Shanghai"
);
}
LOGGER
.
info
(
"Loaded skins...."
);
LOGGER
.
debug
(
"Loaded skins...."
);
Stopwatchs
.
end
();
}
...
...
src/main/java/org/b3log/solo/util/Skins.java
View file @
c3c468ae
...
...
@@ -42,7 +42,7 @@ import org.b3log.solo.SoloServletListener;
* Skin utilities.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.3.
6, Apr 15, 2014
* @version 1.0.3.
7, Oct 31, 2015
* @since 0.3.1
*/
public
final
class
Skins
{
...
...
@@ -82,7 +82,7 @@ public final class Skins {
if
(
null
==
langs
)
{
LANG_MAP
.
clear
();
// Collect unused skin languages
LOGGER
.
log
(
Level
.
INFO
,
"Loading skin [dirName={0}, locale={1}]"
,
new
Object
[]
{
currentSkinDirName
,
localeString
});
LOGGER
.
log
(
Level
.
DEBUG
,
"Loading skin [dirName={0}, locale={1}]"
,
new
Object
[]
{
currentSkinDirName
,
localeString
});
langs
=
new
HashMap
<
String
,
String
>();
final
String
language
=
Locales
.
getLanguage
(
localeString
);
...
...
@@ -102,7 +102,7 @@ public final class Skins {
}
LANG_MAP
.
put
(
langName
,
langs
);
LOGGER
.
log
(
Level
.
INFO
,
"Loaded skin[dirName={0}, locale={1}, keyCount={2}]"
,
LOGGER
.
log
(
Level
.
DEBUG
,
"Loaded skin[dirName={0}, locale={1}, keyCount={2}]"
,
new
Object
[]
{
currentSkinDirName
,
localeString
,
langs
.
size
()});
}
...
...
src/main/resources/log4j.properties
View file @
c3c468ae
...
...
@@ -16,18 +16,21 @@
#
# Description: Solo logging configurations.
# Version: 1.
0.0.3, Feb 1
1, 2015
# Version: 1.
1.0.3, Oct 3
1, 2015
# Author: Liang Ding
#
log4j.rootLogger
=
ERROR
, stdout
log4j.rootLogger
=
INFO
, stdout
log4j.appender.stdout
=
org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target
=
System.out
log4j.appender.stdout.layout
=
org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern
=
[%-5p]-[%d{yyyy-MM-dd HH:mm:ss}]-[%c:%L]: %m%n
log4j.logger.org.b3log.solo
=
ERROR
log4j.logger.org.b3log.solo
=
INFO
log4j.logger.org.b3log.latke
=
ERROR
log4j.logger.org.b3log.latke.util.freemarker.Templates
=
ERROR
log4j.logger.org.eclipse.jetty
=
WARN
log4j.logger.freemarker
=
WARN
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment