The Unified and Autonomous Development Platform
Add server log view page
robin shen6af4d1cdcd85
diff --git a/product/system/conf/logback.xml b/product/system/conf/logback.xmlindex 62cca13abe..07334a15c4 100644--- a/product/system/conf/logback.xml+++ b/product/system/conf/logback.xml@@ -16,7 +16,9 @@<maxIndex>3</maxIndex><FileNamePattern>${logback.logFile}.%i</FileNamePattern></rollingPolicy>- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"/>+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">+ <maxFileSize>5MB</maxFileSize>+ </triggeringPolicy></appender><logger name="org.apache.wicket" level="WARN"/>diff --git a/web/src/main/java/com/gitplex/server/web/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/UrlMapper.javaindex d9b28c1a8a..d8935d512c 100644--- a/web/src/main/java/com/gitplex/server/web/UrlMapper.java+++ b/web/src/main/java/com/gitplex/server/web/UrlMapper.java@@ -3,6 +3,7 @@ package com.gitplex.server.web;import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;import org.apache.wicket.core.request.handler.IPageClassRequestHandler;import org.apache.wicket.core.request.handler.RenderPageRequestHandler;+import org.apache.wicket.core.request.mapper.ResourceMapper;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Request;@@ -33,6 +34,8 @@ import com.gitplex.server.web.page.account.teams.TeamMemberListPage;import com.gitplex.server.web.page.admin.DatabaseBackupPage;import com.gitplex.server.web.page.admin.MailSettingPage;import com.gitplex.server.web.page.admin.SecuritySettingPage;+import com.gitplex.server.web.page.admin.ServerInformationPage;+import com.gitplex.server.web.page.admin.ServerLogPage;import com.gitplex.server.web.page.admin.SystemSettingPage;import com.gitplex.server.web.page.admin.account.NewUserPage;import com.gitplex.server.web.page.admin.account.UserListPage;@@ -71,6 +74,7 @@ import com.gitplex.server.web.util.mapper.WebPageMapper;import com.gitplex.server.web.util.resource.ArchiveResourceReference;import com.gitplex.server.web.util.resource.AttachmentResourceReference;import com.gitplex.server.web.util.resource.RawBlobResourceReference;+import com.gitplex.server.web.util.resource.ServerLogResourceReference;public class UrlMapper extends CompoundRequestMapper {@@ -89,6 +93,7 @@ public class UrlMapper extends CompoundRequestMapper {}private void addResources() {+ add(new ResourceMapper("resource/server-log", new ServerLogResourceReference()));add(new DepotResourceMapper("${account}/${depot}/archive/${revision}", new ArchiveResourceReference()));add(new DepotResourceMapper("${account}/${depot}/raw/${revision}/${path}", new RawBlobResourceReference()));add(new DepotResourceMapper("${account}/${depot}/attachment/${uuid}/${attachment}",@@ -109,6 +114,8 @@ public class UrlMapper extends CompoundRequestMapper {add(new WebPageMapper("administration/settings/mail", MailSettingPage.class));add(new WebPageMapper("administration/settings/backup", DatabaseBackupPage.class));add(new WebPageMapper("administration/settings/security", SecuritySettingPage.class));+ add(new WebPageMapper("administration/server-log", ServerLogPage.class));+ add(new WebPageMapper("administration/server-information", ServerInformationPage.class));}private void addAccountPages() {diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.javaindex 1f6cacc93d..920d4f8c30 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java@@ -33,6 +33,7 @@ public abstract class AdministrationPage extends LayoutPage {tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));tabs.add(new AdministrationTab("User Management", "fa fa-fw fa-user", UserListPage.class, NewUserPage.class));+ tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));tabs.add(new AdministrationTab("Server Information", "fa fa-fw fa-desktop", ServerInformationPage.class));add(new Tabbable("tabs", tabs));diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.htmlnew file mode 100644index 0000000000..72d7000ae5--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.html@@ -0,0 +1,11 @@+<wicket:extend>+ <div class="server-log">+ <div class="head">+ <a wicket:id="download" class="btn btn-default"><i class="fa fa-download"></i> Download Full Log</a>+ </div>+ <div class="body">+ <div wicket:id="warning" class="alert alert-warning"></div>+ <pre wicket:id="logContent"></pre>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.javanew file mode 100644index 0000000000..9005682827--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.java@@ -0,0 +1,37 @@+package com.gitplex.server.web.page.admin;++import java.util.List;++import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.ResourceLink;++import com.gitplex.server.web.util.resource.ServerLogResource;+import com.gitplex.server.web.util.resource.ServerLogResourceReference;+import com.google.common.base.Joiner;++@SuppressWarnings("serial")+public class ServerLogPage extends AdministrationPage {++ private static final int MAX_DISPLAY_LINES = 5000;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ResourceLink<Void>("download", new ServerLogResourceReference()));++ List<String> lines = ServerLogResource.readServerLog();+ String content;+ if (lines.size() > MAX_DISPLAY_LINES) {+ add(new Label("warning", "Too many log entries, displaying recent " + MAX_DISPLAY_LINES));+ content = Joiner.on("\n").join(lines.subList(lines.size()-MAX_DISPLAY_LINES, lines.size()));+ } else {+ add(new WebMarkupContainer("warning").setVisible(false));+ content = Joiner.on("\n").join(lines);+ }++ add(new Label("logContent", content));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css b/web/src/main/java/com/gitplex/server/web/page/admin/administration.cssindex 166910ad5d..2c426ecee3 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css+++ b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css@@ -17,3 +17,12 @@font-weight: bold;font-size: 12px;}++.server-log>.head {+ margin-bottom: 20px;+}+.server-log>.body>pre {+ background: black;+ border: 1px solid black;+ color: white;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.javanew file mode 100644index 0000000000..a09dc6fc4b--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResource.java@@ -0,0 +1,69 @@+package com.gitplex.server.web.util.resource;++import java.io.File;+import java.io.IOException;+import java.io.UnsupportedEncodingException;+import java.net.URLEncoder;+import java.util.ArrayList;+import java.util.List;++import org.apache.shiro.authz.UnauthorizedException;+import org.apache.tika.mime.MimeTypes;+import org.apache.wicket.request.resource.AbstractResource;++import com.gitplex.launcher.bootstrap.Bootstrap;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.FileUtils;+import com.google.common.base.Charsets;+import com.google.common.base.Joiner;++public class ServerLogResource extends AbstractResource {++ private static final long serialVersionUID = 1L;++ @Override+ protected ResourceResponse newResourceResponse(Attributes attributes) {+ if (!SecurityUtils.canManageSystem())+ throw new UnauthorizedException();++ ResourceResponse response = new ResourceResponse();+ response.setContentType(MimeTypes.OCTET_STREAM);++ response.disableCaching();++ try {+ response.setFileName(URLEncoder.encode("server.log", Charsets.UTF_8.name()));+ } catch (UnsupportedEncodingException e) {+ throw new RuntimeException(e);+ }+ response.setWriteCallback(new WriteCallback() {++ @Override+ public void writeData(Attributes attributes) throws IOException {+ String content = Joiner.on("\n").join(readServerLog());+ attributes.getResponse().getOutputStream().write(content.getBytes(Charsets.UTF_8));+ }+ });++ return response;+ }++ public static List<String> readServerLog() {+ File logFile = new File(Bootstrap.installDir, "logs/server.log");+ List<String> lines = new ArrayList<>();+ int index = logFile.getParentFile().list().length;+ try {+ File logDir = logFile.getParentFile();+ for (int i=index; i>=1; i--) {+ File rollFile = new File(logDir, logFile.getName() + "." + i);+ if (rollFile.exists())+ lines.addAll((FileUtils.readLines(rollFile, Charsets.UTF_8)));+ }+ lines.addAll((FileUtils.readLines(logFile, Charsets.UTF_8)));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return lines;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResourceReference.java b/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResourceReference.javanew file mode 100644index 0000000000..8d28f94637--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ServerLogResourceReference.java@@ -0,0 +1,19 @@+package com.gitplex.server.web.util.resource;++import org.apache.wicket.request.resource.IResource;+import org.apache.wicket.request.resource.ResourceReference;++public class ServerLogResourceReference extends ResourceReference {++ private static final long serialVersionUID = 1L;++ public ServerLogResourceReference() {+ super("server-log");+ }++ @Override+ public IResource getResource() {+ return new ServerLogResource();+ }++}