Commit e0c5464c authored by Liang Ding's avatar Liang Ding

🎨 避免重启

parent 5d6355cf
...@@ -21,7 +21,6 @@ import org.apache.commons.io.FileUtils; ...@@ -21,7 +21,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
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.ioc.Inject; import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
...@@ -40,7 +39,7 @@ import java.util.*; ...@@ -40,7 +39,7 @@ import java.util.*;
* Import service. * Import service.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.4, Mar 17, 2019 * @version 1.0.1.5, Mar 20, 2019
* @since 2.2.0 * @since 2.2.0
*/ */
@Service @Service
...@@ -89,12 +88,6 @@ public class ImportService { ...@@ -89,12 +88,6 @@ public class ImportService {
return; return;
} }
String serverHost = Latkes.getLatkeProperty("serverHost");
if (StringUtils.isBlank(serverHost)) {
serverHost = "localhost";
Latkes.setLatkeProperty("serverHost", serverHost);
}
final String adminId = admin.optString(Keys.OBJECT_ID); final String adminId = admin.optString(Keys.OBJECT_ID);
int succCnt = 0, failCnt = 0; int succCnt = 0, failCnt = 0;
...@@ -146,9 +139,6 @@ public class ImportService { ...@@ -146,9 +139,6 @@ public class ImportService {
logBuilder.append(" :p"); logBuilder.append(" :p");
} }
LOGGER.info(logBuilder.toString()); LOGGER.info(logBuilder.toString());
LOGGER.log(Level.INFO, "Imported articles, please restart Solo");
System.exit(0);
}).start(); }).start();
} }
......
...@@ -41,7 +41,7 @@ import java.util.List; ...@@ -41,7 +41,7 @@ import java.util.List;
* Upgrade script from v3.0.0 to v3.1.0. * Upgrade script from v3.0.0 to v3.1.0.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.0, Mar 4, 2019 * @version 1.0.1.1, Mar 20, 2019
* @since 3.1.0 * @since 3.1.0
*/ */
public final class V300_310 { public final class V300_310 {
...@@ -63,12 +63,6 @@ public final class V300_310 { ...@@ -63,12 +63,6 @@ public final class V300_310 {
final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class); final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class);
final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class); final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class);
String serverHost = Latkes.getLatkeProperty("serverHost");
if (StringUtils.isBlank(serverHost)) {
serverHost = "localhost";
Latkes.setLatkeProperty("serverHost", serverHost);
}
try { try {
Connection connection = Connections.getConnection(); Connection connection = Connections.getConnection();
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
...@@ -107,9 +101,6 @@ public final class V300_310 { ...@@ -107,9 +101,6 @@ public final class V300_310 {
} }
transaction.commit(); transaction.commit();
LOGGER.log(Level.INFO, "Upgraded from version [3.0.0] to version [3.1.0] successfully, please restart Solo");
System.exit(0);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.ERROR, "Upgrade failed!", e); LOGGER.log(Level.ERROR, "Upgrade failed!", e);
......
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