| Revision | 82 (tree) |
|---|---|
| Time | 2015-08-23 13:47:44 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -10,7 +10,6 @@ | ||
| 10 | 10 | import java.util.StringJoiner; |
| 11 | 11 | |
| 12 | 12 | import org.apache.logging.log4j.LogManager; |
| 13 | -import org.apache.logging.log4j.Logger; | |
| 14 | 13 | import org.apache.logging.log4j.ThreadContext; |
| 15 | 14 | |
| 16 | 15 | import batch.base.BaseBatch; |
| @@ -45,9 +44,6 @@ | ||
| 45 | 44 | /** 処理件数設定用タグ:ファイル削除件数 */ |
| 46 | 45 | protected static final String REMOVE = "REMOVE"; |
| 47 | 46 | |
| 48 | - /** ログ出力用クラス */ | |
| 49 | - private static final Logger LOGGER = LogManager.getLogger(ProjectBatch.class); | |
| 50 | - | |
| 51 | 47 | /** ログ出力区分 */ |
| 52 | 48 | private static final String KUBUN_RUN = "BatRun"; |
| 53 | 49 | /** ログサフィックス */ |
| @@ -117,7 +113,7 @@ | ||
| 117 | 113 | StringJoiner sb = getLogHeader(); |
| 118 | 114 | sb.add(KUBUN_RUN); |
| 119 | 115 | sb.add(str); |
| 120 | - LOGGER.fatal(sb.toString()); | |
| 116 | + LogManager.getLogger().fatal(sb.toString()); | |
| 121 | 117 | } |
| 122 | 118 | |
| 123 | 119 | /** |
| @@ -200,13 +196,13 @@ | ||
| 200 | 196 | */ |
| 201 | 197 | protected final void printResult() { |
| 202 | 198 | for (final String msg : this.msgList) { |
| 203 | - LOGGER.fatal(msg); | |
| 199 | + LogManager.getLogger().fatal(msg); | |
| 204 | 200 | } |
| 205 | 201 | |
| 206 | 202 | List<Pair<String, String>> list = getOutputFiles(); |
| 207 | 203 | if (list != null) { |
| 208 | 204 | for (final Pair<String, String> file : list) { |
| 209 | - LOGGER.fatal(file.left()); | |
| 205 | + LogManager.getLogger().fatal(file.left()); | |
| 210 | 206 | } |
| 211 | 207 | } |
| 212 | 208 | } |
| @@ -4,13 +4,12 @@ | ||
| 4 | 4 | import java.util.Objects; |
| 5 | 5 | |
| 6 | 6 | import org.apache.logging.log4j.LogManager; |
| 7 | -import org.apache.logging.log4j.Logger; | |
| 8 | 7 | |
| 9 | -import project.common.master.Msg; | |
| 10 | 8 | import batch.base.Batch; |
| 11 | 9 | import batch.base.BatchStatus; |
| 12 | 10 | import core.config.Env; |
| 13 | 11 | import core.config.Factory; |
| 12 | +import project.common.master.Msg; | |
| 14 | 13 | |
| 15 | 14 | /** |
| 16 | 15 | * バッチステータスクラス |
| @@ -35,9 +34,6 @@ | ||
| 35 | 34 | /** バッチ処理 ファイル削除時メッセージコード */ |
| 36 | 35 | public static final String MSGID_RMV = "Message.RMV_FILE"; |
| 37 | 36 | |
| 38 | - /** ログ出力用クラス */ | |
| 39 | - private static final Logger LOGGER = LogManager.getLogger(BatStatus.class); | |
| 40 | - | |
| 41 | 37 | /** ジョブステータス */ |
| 42 | 38 | private final BatchStatus status = new BatchStatus(); |
| 43 | 39 |
| @@ -90,22 +86,22 @@ | ||
| 90 | 86 | Msg msg = Factory.create(Msg.class); |
| 91 | 87 | List<Integer> list = this.status.getCleared(); |
| 92 | 88 | if (0 < list.size()) { |
| 93 | - LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_DEL), | |
| 89 | + LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_DEL), | |
| 94 | 90 | Env.getEnv("JobStatus.Table"), |
| 95 | 91 | Objects.toString(list.get(0), ""))); |
| 96 | 92 | } |
| 97 | 93 | if (1 < list.size()) { |
| 98 | - LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_DEL), | |
| 94 | + LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_DEL), | |
| 99 | 95 | Env.getEnv("JobDetail.Table"), |
| 100 | 96 | Objects.toString(list.get(1), ""))); |
| 101 | 97 | } |
| 102 | 98 | if (2 < list.size()) { |
| 103 | - LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_DEL), | |
| 99 | + LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_DEL), | |
| 104 | 100 | Env.getEnv("JobFile.Table"), |
| 105 | 101 | Objects.toString(list.get(2), ""))); |
| 106 | 102 | } |
| 107 | 103 | if (3 < list.size()) { |
| 108 | - LOGGER.fatal(msg.getMessage(Env.getEnv(MSGID_RMV), | |
| 104 | + LogManager.getLogger().fatal(msg.getMessage(Env.getEnv(MSGID_RMV), | |
| 109 | 105 | "", Objects.toString(list.get(3), ""))); |
| 110 | 106 | } |
| 111 | 107 | } |
| @@ -131,7 +127,7 @@ | ||
| 131 | 127 | ret = this.status.checkJobStart(prms); |
| 132 | 128 | return ret; |
| 133 | 129 | } finally { |
| 134 | - LOGGER.fatal(getMessageHeader() | |
| 130 | + LogManager.getLogger().fatal(getMessageHeader() | |
| 135 | 131 | + ",,Start,ジョブが開始しました。" + getMessageResult(ret)); |
| 136 | 132 | } |
| 137 | 133 | } |
| @@ -148,7 +144,7 @@ | ||
| 148 | 144 | ret = this.status.checkLastJobDetail(prms); |
| 149 | 145 | return ret; |
| 150 | 146 | } finally { |
| 151 | - LOGGER.fatal(getMessageHeader() | |
| 147 | + LogManager.getLogger().fatal(getMessageHeader() | |
| 152 | 148 | + ",,Continue,ジョブが継続しました。" + getMessageResult(ret)); |
| 153 | 149 | } |
| 154 | 150 | } |
| @@ -165,7 +161,7 @@ | ||
| 165 | 161 | ret = this.status.checkAllJobDetail(prms); |
| 166 | 162 | return ret; |
| 167 | 163 | } finally { |
| 168 | - LOGGER.fatal(getMessageHeader() | |
| 164 | + LogManager.getLogger().fatal(getMessageHeader() | |
| 169 | 165 | + ",,End,全ジョブが終了しました。" + getMessageResult(ret)); |
| 170 | 166 | } |
| 171 | 167 | } |
| @@ -13,18 +13,17 @@ | ||
| 13 | 13 | import java.util.Objects; |
| 14 | 14 | |
| 15 | 15 | import org.apache.logging.log4j.LogManager; |
| 16 | -import org.apache.logging.log4j.Logger; | |
| 17 | 16 | |
| 18 | 17 | 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; | |
| 23 | 18 | import common.db.JdbcSource; |
| 24 | 19 | import core.config.Factory; |
| 25 | 20 | import core.exception.PhysicalException; |
| 26 | 21 | import core.file.ZippedLineOutputStream; |
| 27 | 22 | 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; | |
| 28 | 27 | |
| 29 | 28 | /** |
| 30 | 29 | * 汎用CSV一括出力 |
| @@ -31,8 +30,6 @@ | ||
| 31 | 30 | * @author Tadashi Nakayama |
| 32 | 31 | */ |
| 33 | 32 | public final class ExtractBatch extends ProjectBatch { |
| 34 | - /** ログ出力用クラス */ | |
| 35 | - private static final Logger LOGGER = LogManager.getLogger(ExtractBatch.class); | |
| 36 | 33 | |
| 37 | 34 | /** Charset */ |
| 38 | 35 | private Charset charset = StandardCharsets.UTF_8; |
| @@ -114,9 +111,9 @@ | ||
| 114 | 111 | ExtractBatchBuilder bd = new ExtractBatchBuilder(); |
| 115 | 112 | bd.setParam(bind); |
| 116 | 113 | if (!bd.build()) { |
| 117 | - LOGGER.fatal("パターン取得失敗:[" + bind.get("Id") + "]"); | |
| 114 | + LogManager.getLogger().fatal("パターン取得失敗:[" + bind.get("Id") + "]"); | |
| 118 | 115 | } else { |
| 119 | - LOGGER.fatal("パターン取得:[" + bd.getNmUserPattern() + "]"); | |
| 116 | + LogManager.getLogger().fatal("パターン取得:[" + bd.getNmUserPattern() + "]"); | |
| 120 | 117 | |
| 121 | 118 | setOutputInfo(zlos, bd); |
| 122 | 119 | output(zlos, bd, bind); |
| @@ -7,21 +7,18 @@ | ||
| 7 | 7 | import java.util.StringJoiner; |
| 8 | 8 | |
| 9 | 9 | import org.apache.logging.log4j.LogManager; |
| 10 | -import org.apache.logging.log4j.Logger; | |
| 11 | 10 | |
| 12 | -import project.common.master.Msg; | |
| 13 | 11 | import batch.base.Batch; |
| 14 | 12 | import batch.base.BatchProcessor; |
| 15 | 13 | import batch.base.BatchProcessorImpl; |
| 16 | - | |
| 17 | 14 | import common.db.JdbcSource; |
| 18 | 15 | import common.db.jdbc.Jdbc; |
| 19 | 16 | import common.sql.QueryUtil; |
| 20 | - | |
| 21 | 17 | import core.config.Env; |
| 22 | 18 | import core.config.Factory; |
| 23 | 19 | import core.exception.PhysicalException; |
| 24 | 20 | import core.exception.ThrowableUtil; |
| 21 | +import project.common.master.Msg; | |
| 25 | 22 | |
| 26 | 23 | /** |
| 27 | 24 | * バッチ基盤クラス |
| @@ -45,9 +42,6 @@ | ||
| 45 | 42 | /** バッチ処理 バッチステータス不正メッセージコード */ |
| 46 | 43 | public static final String MSGID_ERROR_STS = "ZZ999999006"; |
| 47 | 44 | |
| 48 | - /** ログ出力用クラス */ | |
| 49 | - private static final Logger LOGGER = LogManager.getLogger(ProjectPerform.class); | |
| 50 | - | |
| 51 | 45 | /** ログ出力区分 */ |
| 52 | 46 | private static final String KUBUN_START = "BatStart"; |
| 53 | 47 | /** ログ出力区分 */ |
| @@ -138,7 +132,7 @@ | ||
| 138 | 132 | } finally { |
| 139 | 133 | this.bp.getBatch().printResult(); |
| 140 | 134 | // 終了ログ出力 |
| 141 | - LOGGER.fatal(getFinalLog(exitCode)); | |
| 135 | + LogManager.getLogger().fatal(getFinalLog(exitCode)); | |
| 142 | 136 | exitCode = postprocess(exitCode); |
| 143 | 137 | } |
| 144 | 138 |
| @@ -163,7 +157,7 @@ | ||
| 163 | 157 | StringJoiner sb = bat.getLogHeader(); |
| 164 | 158 | sb.add(KUBUN_START); |
| 165 | 159 | sb.add(msg.getMessage(MSGID_START, bat.getBatchName())); |
| 166 | - LOGGER.fatal(sb.toString()); | |
| 160 | + LogManager.getLogger().fatal(sb.toString()); | |
| 167 | 161 | } |
| 168 | 162 | return ret; |
| 169 | 163 | } |
| @@ -9,16 +9,14 @@ | ||
| 9 | 9 | import javax.imageio.ImageIO; |
| 10 | 10 | |
| 11 | 11 | import org.apache.logging.log4j.LogManager; |
| 12 | -import org.apache.logging.log4j.Logger; | |
| 13 | 12 | |
| 13 | +import common.db.JdbcSource; | |
| 14 | +import common.db.dao.Dao; | |
| 15 | +import common.db.dao.DaoConstraintException; | |
| 14 | 16 | import project.batch.ProjectBatch; |
| 15 | 17 | import project.batch.ProjectPerform; |
| 16 | 18 | import project.db.model.FooMaster; |
| 17 | 19 | |
| 18 | -import common.db.JdbcSource; | |
| 19 | -import common.db.dao.Dao; | |
| 20 | -import common.db.dao.DaoConstraintException; | |
| 21 | - | |
| 22 | 20 | /** |
| 23 | 21 | * バッチサンプルクラス |
| 24 | 22 | * |
| @@ -26,8 +24,6 @@ | ||
| 26 | 24 | * @version 1.0.0 |
| 27 | 25 | */ |
| 28 | 26 | public final class Sample extends ProjectBatch { |
| 29 | - /** ログ出力オブジェクト */ | |
| 30 | - private static final Logger LOGGER = LogManager.getLogger(Sample.class); | |
| 31 | 27 | |
| 32 | 28 | /** |
| 33 | 29 | * メイン処理 |
| @@ -44,7 +40,7 @@ | ||
| 44 | 40 | */ |
| 45 | 41 | @Override |
| 46 | 42 | public int perform(final String... args) { |
| 47 | - LOGGER.debug("start perform"); | |
| 43 | + LogManager.getLogger().debug("start perform"); | |
| 48 | 44 | |
| 49 | 45 | try (Dao dao = JdbcSource.getDao()) { |
| 50 | 46 | FooMaster fm = new FooMaster(); |
| @@ -64,7 +60,7 @@ | ||
| 64 | 60 | |
| 65 | 61 | dao.commit(); |
| 66 | 62 | } catch (final DaoConstraintException ex) { |
| 67 | - LOGGER.warn(ex.getMessage()); | |
| 63 | + LogManager.getLogger().warn(ex.getMessage()); | |
| 68 | 64 | } |
| 69 | 65 | |
| 70 | 66 | // サムネイル |
| @@ -77,13 +73,13 @@ | ||
| 77 | 73 | width, height, Image.SCALE_AREA_AVERAGING), 0, 0, width, height, null); |
| 78 | 74 | ImageIO.write(shrinkImage, "jpg", new File("./2.jpg")); |
| 79 | 75 | } catch (final IOException ex) { |
| 80 | - LOGGER.error(ex.getMessage(), ex); | |
| 76 | + LogManager.getLogger().error(ex.getMessage(), ex); | |
| 81 | 77 | } |
| 82 | 78 | |
| 83 | 79 | this.addFile("c:\\temp\\aaa.txt", "AAA"); |
| 84 | 80 | this.addFile("c:\\temp\\bbb.txt", "BBB"); |
| 85 | 81 | |
| 86 | - LOGGER.debug("end perform"); | |
| 82 | + LogManager.getLogger().debug("end perform"); | |
| 87 | 83 | |
| 88 | 84 | return RET_SUCCESS; |
| 89 | 85 | } |