• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision82 (tree)
Time2015-08-23 13:47:44
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/pjBat/src/project/batch/ProjectBatch.java (revision 81)
+++ trunk/framework/pjBat/src/project/batch/ProjectBatch.java (revision 82)
@@ -10,7 +10,6 @@
1010 import java.util.StringJoiner;
1111
1212 import org.apache.logging.log4j.LogManager;
13-import org.apache.logging.log4j.Logger;
1413 import org.apache.logging.log4j.ThreadContext;
1514
1615 import batch.base.BaseBatch;
@@ -45,9 +44,6 @@
4544 /** 処理件数設定用タグ:ファイル削除件数 */
4645 protected static final String REMOVE = "REMOVE";
4746
48- /** ログ出力用クラス */
49- private static final Logger LOGGER = LogManager.getLogger(ProjectBatch.class);
50-
5147 /** ログ出力区分 */
5248 private static final String KUBUN_RUN = "BatRun";
5349 /** ログサフィックス */
@@ -117,7 +113,7 @@
117113 StringJoiner sb = getLogHeader();
118114 sb.add(KUBUN_RUN);
119115 sb.add(str);
120- LOGGER.fatal(sb.toString());
116+ LogManager.getLogger().fatal(sb.toString());
121117 }
122118
123119 /**
@@ -200,13 +196,13 @@
200196 */
201197 protected final void printResult() {
202198 for (final String msg : this.msgList) {
203- LOGGER.fatal(msg);
199+ LogManager.getLogger().fatal(msg);
204200 }
205201
206202 List<Pair<String, String>> list = getOutputFiles();
207203 if (list != null) {
208204 for (final Pair<String, String> file : list) {
209- LOGGER.fatal(file.left());
205+ LogManager.getLogger().fatal(file.left());
210206 }
211207 }
212208 }
--- trunk/framework/pjBat/src/project/batch/BatStatus.java (revision 81)
+++ trunk/framework/pjBat/src/project/batch/BatStatus.java (revision 82)
@@ -4,13 +4,12 @@
44 import java.util.Objects;
55
66 import org.apache.logging.log4j.LogManager;
7-import org.apache.logging.log4j.Logger;
87
9-import project.common.master.Msg;
108 import batch.base.Batch;
119 import batch.base.BatchStatus;
1210 import core.config.Env;
1311 import core.config.Factory;
12+import project.common.master.Msg;
1413
1514 /**
1615 * バッチステータスクラス
@@ -35,9 +34,6 @@
3534 /** バッチ処理 ファイル削除時メッセージコード */
3635 public static final String MSGID_RMV = "Message.RMV_FILE";
3736
38- /** ログ出力用クラス */
39- private static final Logger LOGGER = LogManager.getLogger(BatStatus.class);
40-
4137 /** ジョブステータス */
4238 private final BatchStatus status = new BatchStatus();
4339
@@ -90,22 +86,22 @@
9086 Msg msg = Factory.create(Msg.class);
9187 List<Integer> list = this.status.getCleared();
9288 if (0 < list.size()) {
93- LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_DEL),
89+ LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_DEL),
9490 Env.getEnv("JobStatus.Table"),
9591 Objects.toString(list.get(0), "")));
9692 }
9793 if (1 < list.size()) {
98- LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_DEL),
94+ LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_DEL),
9995 Env.getEnv("JobDetail.Table"),
10096 Objects.toString(list.get(1), "")));
10197 }
10298 if (2 < list.size()) {
103- LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_DEL),
99+ LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_DEL),
104100 Env.getEnv("JobFile.Table"),
105101 Objects.toString(list.get(2), "")));
106102 }
107103 if (3 < list.size()) {
108- LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_RMV),
104+ LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_RMV),
109105 "", Objects.toString(list.get(3), "")));
110106 }
111107 }
@@ -131,7 +127,7 @@
131127 ret = this.status.checkJobStart(prms);
132128 return ret;
133129 } finally {
134- LOGGER.fatal(getMessageHeader()
130+ LogManager.getLogger().fatal(getMessageHeader()
135131 + ",,Start,ジョブが開始しました。" + getMessageResult(ret));
136132 }
137133 }
@@ -148,7 +144,7 @@
148144 ret = this.status.checkLastJobDetail(prms);
149145 return ret;
150146 } finally {
151- LOGGER.fatal(getMessageHeader()
147+ LogManager.getLogger().fatal(getMessageHeader()
152148 + ",,Continue,ジョブが継続しました。" + getMessageResult(ret));
153149 }
154150 }
@@ -165,7 +161,7 @@
165161 ret = this.status.checkAllJobDetail(prms);
166162 return ret;
167163 } finally {
168- LOGGER.fatal(getMessageHeader()
164+ LogManager.getLogger().fatal(getMessageHeader()
169165 + ",,End,全ジョブが終了しました。" + getMessageResult(ret));
170166 }
171167 }
--- trunk/framework/pjBat/src/project/batch/generic/csv/ExtractBatch.java (revision 81)
+++ trunk/framework/pjBat/src/project/batch/generic/csv/ExtractBatch.java (revision 82)
@@ -13,18 +13,17 @@
1313 import java.util.Objects;
1414
1515 import org.apache.logging.log4j.LogManager;
16-import org.apache.logging.log4j.Logger;
1716
1817 import batch.util.ParameterUtil;
19-import project.batch.ProjectBatch;
20-import project.batch.ProjectPerform;
21-import project.common.CsvUtil;
22-import project.common.master.AppConfig;
2318 import common.db.JdbcSource;
2419 import core.config.Factory;
2520 import core.exception.PhysicalException;
2621 import core.file.ZippedLineOutputStream;
2722 import core.util.MojiUtil;
23+import project.batch.ProjectBatch;
24+import project.batch.ProjectPerform;
25+import project.common.CsvUtil;
26+import project.common.master.AppConfig;
2827
2928 /**
3029 * 汎用CSV一括出力
@@ -31,8 +30,6 @@
3130 * @author Tadashi Nakayama
3231 */
3332 public final class ExtractBatch extends ProjectBatch {
34- /** ログ出力用クラス */
35- private static final Logger LOGGER = LogManager.getLogger(ExtractBatch.class);
3633
3734 /** Charset */
3835 private Charset charset = StandardCharsets.UTF_8;
@@ -114,9 +111,9 @@
114111 ExtractBatchBuilder bd = new ExtractBatchBuilder();
115112 bd.setParam(bind);
116113 if (!bd.build()) {
117- LOGGER.fatal("パターン取得失敗:[" + bind.get("Id") + "]");
114+ LogManager.getLogger().fatal("パターン取得失敗:[" + bind.get("Id") + "]");
118115 } else {
119- LOGGER.fatal("パターン取得:[" + bd.getNmUserPattern() + "]");
116+ LogManager.getLogger().fatal("パターン取得:[" + bd.getNmUserPattern() + "]");
120117
121118 setOutputInfo(zlos, bd);
122119 output(zlos, bd, bind);
--- trunk/framework/pjBat/src/project/batch/ProjectPerform.java (revision 81)
+++ trunk/framework/pjBat/src/project/batch/ProjectPerform.java (revision 82)
@@ -7,21 +7,18 @@
77 import java.util.StringJoiner;
88
99 import org.apache.logging.log4j.LogManager;
10-import org.apache.logging.log4j.Logger;
1110
12-import project.common.master.Msg;
1311 import batch.base.Batch;
1412 import batch.base.BatchProcessor;
1513 import batch.base.BatchProcessorImpl;
16-
1714 import common.db.JdbcSource;
1815 import common.db.jdbc.Jdbc;
1916 import common.sql.QueryUtil;
20-
2117 import core.config.Env;
2218 import core.config.Factory;
2319 import core.exception.PhysicalException;
2420 import core.exception.ThrowableUtil;
21+import project.common.master.Msg;
2522
2623 /**
2724 * バッチ基盤クラス
@@ -45,9 +42,6 @@
4542 /** バッチ処理 バッチステータス不正メッセージコード */
4643 public static final String MSGID_ERROR_STS = "ZZ999999006";
4744
48- /** ログ出力用クラス */
49- private static final Logger LOGGER = LogManager.getLogger(ProjectPerform.class);
50-
5145 /** ログ出力区分 */
5246 private static final String KUBUN_START = "BatStart";
5347 /** ログ出力区分 */
@@ -138,7 +132,7 @@
138132 } finally {
139133 this.bp.getBatch().printResult();
140134 // 終了ログ出力
141- LOGGER.fatal(getFinalLog(exitCode));
135+ LogManager.getLogger().fatal(getFinalLog(exitCode));
142136 exitCode = postprocess(exitCode);
143137 }
144138
@@ -163,7 +157,7 @@
163157 StringJoiner sb = bat.getLogHeader();
164158 sb.add(KUBUN_START);
165159 sb.add(msg.getMessage(MSGID_START, bat.getBatchName()));
166- LOGGER.fatal(sb.toString());
160+ LogManager.getLogger().fatal(sb.toString());
167161 }
168162 return ret;
169163 }
--- trunk/framework/pjBat/src/project/batch/sample/Sample.java (revision 81)
+++ trunk/framework/pjBat/src/project/batch/sample/Sample.java (revision 82)
@@ -9,16 +9,14 @@
99 import javax.imageio.ImageIO;
1010
1111 import org.apache.logging.log4j.LogManager;
12-import org.apache.logging.log4j.Logger;
1312
13+import common.db.JdbcSource;
14+import common.db.dao.Dao;
15+import common.db.dao.DaoConstraintException;
1416 import project.batch.ProjectBatch;
1517 import project.batch.ProjectPerform;
1618 import project.db.model.FooMaster;
1719
18-import common.db.JdbcSource;
19-import common.db.dao.Dao;
20-import common.db.dao.DaoConstraintException;
21-
2220 /**
2321 * バッチサンプルクラス
2422 *
@@ -26,8 +24,6 @@
2624 * @version 1.0.0
2725 */
2826 public final class Sample extends ProjectBatch {
29- /** ログ出力オブジェクト */
30- private static final Logger LOGGER = LogManager.getLogger(Sample.class);
3127
3228 /**
3329 * メイン処理
@@ -44,7 +40,7 @@
4440 */
4541 @Override
4642 public int perform(final String... args) {
47- LOGGER.debug("start perform");
43+ LogManager.getLogger().debug("start perform");
4844
4945 try (Dao dao = JdbcSource.getDao()) {
5046 FooMaster fm = new FooMaster();
@@ -64,7 +60,7 @@
6460
6561 dao.commit();
6662 } catch (final DaoConstraintException ex) {
67- LOGGER.warn(ex.getMessage());
63+ LogManager.getLogger().warn(ex.getMessage());
6864 }
6965
7066 // サムネイル
@@ -77,13 +73,13 @@
7773 width, height, Image.SCALE_AREA_AVERAGING), 0, 0, width, height, null);
7874 ImageIO.write(shrinkImage, "jpg", new File("./2.jpg"));
7975 } catch (final IOException ex) {
80- LOGGER.error(ex.getMessage(), ex);
76+ LogManager.getLogger().error(ex.getMessage(), ex);
8177 }
8278
8379 this.addFile("c:\\temp\\aaa.txt", "AAA");
8480 this.addFile("c:\\temp\\bbb.txt", "BBB");
8581
86- LOGGER.debug("end perform");
82+ LogManager.getLogger().debug("end perform");
8783
8884 return RET_SUCCESS;
8985 }