| Revision | 80 (tree) |
|---|---|
| Time | 2015-08-23 13:44:12 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -89,8 +89,7 @@ | ||
| 89 | 89 | |
| 90 | 90 | try (Connection conn = JobUtil.getConnection()) { |
| 91 | 91 | // ジョブ管理テーブルのパラメタを取得 |
| 92 | - LogManager.getLogger(BatchParameterImpl.class).info( | |
| 93 | - "jobseq={}", String.valueOf(this.jobSeq)); | |
| 92 | + LogManager.getLogger().info("jobseq={}", String.valueOf(this.jobSeq)); | |
| 94 | 93 | Job job = js.getJobWithLock(conn, this.jobSeq); |
| 95 | 94 | // パラメタ設定 |
| 96 | 95 | setJobName(job.getJobName()); |
| @@ -12,7 +12,6 @@ | ||
| 12 | 12 | import java.util.concurrent.TimeUnit; |
| 13 | 13 | |
| 14 | 14 | import org.apache.logging.log4j.LogManager; |
| 15 | -import org.apache.logging.log4j.Logger; | |
| 16 | 15 | |
| 17 | 16 | import batch.controller.JobUtil; |
| 18 | 17 | import batch.status.Job; |
| @@ -44,9 +43,6 @@ | ||
| 44 | 43 | /** 起動パラメタ(バッチジョブクリア) */ |
| 45 | 44 | public static final String JOB_CLEAR = "-clear"; |
| 46 | 45 | |
| 47 | - /** ログ出力用クラス */ | |
| 48 | - private static final Logger LOGGER = LogManager.getLogger(BatchStatus.class); | |
| 49 | - | |
| 50 | 46 | /** 削除対象日付(日数)のデフォルト値 */ |
| 51 | 47 | private int interval = 6; |
| 52 | 48 | /** ジョブID */ |
| @@ -218,9 +214,7 @@ | ||
| 218 | 214 | * @return バッチ終了ステータス |
| 219 | 215 | */ |
| 220 | 216 | public int checkJobStart(final String... prms) { |
| 221 | - if (LOGGER.isDebugEnabled()) { | |
| 222 | - LOGGER.debug(String.valueOf(prms.length)); | |
| 223 | - } | |
| 217 | + LogManager.getLogger().debug(String.valueOf(prms.length)); | |
| 224 | 218 | |
| 225 | 219 | int ret = Batch.RET_SUCCESS; |
| 226 | 220 | try (Connection conn = JobUtil.getConnection()) { |
| @@ -296,9 +290,7 @@ | ||
| 296 | 290 | * @return バッチ終了ステータス |
| 297 | 291 | */ |
| 298 | 292 | public int checkLastJobDetail(final String... prms) { |
| 299 | - if (LOGGER.isDebugEnabled()) { | |
| 300 | - LOGGER.debug(String.valueOf(prms.length)); | |
| 301 | - } | |
| 293 | + LogManager.getLogger().debug(String.valueOf(prms.length)); | |
| 302 | 294 | |
| 303 | 295 | int ret = Batch.RET_FAILED; |
| 304 | 296 | try (Connection conn = JobUtil.getConnection()) { |
| @@ -408,7 +400,7 @@ | ||
| 408 | 400 | // ジョブ詳細管理状態取得 |
| 409 | 401 | List<JobDetail> dtllst = updateJobDetail(conn, job.getJobSts()); |
| 410 | 402 | if (dtllst == null || dtllst.isEmpty()) { |
| 411 | - LOGGER.info("detail list is empty."); | |
| 403 | + LogManager.getLogger().info("detail list is empty."); | |
| 412 | 404 | job.setMsgTxt(""); |
| 413 | 405 | job.setJobSts(JobState.ID_B_INVALID.value()); |
| 414 | 406 | return Batch.RET_SUCCESS; |
| @@ -459,11 +451,9 @@ | ||
| 459 | 451 | int dtlno = dtllst.size(); |
| 460 | 452 | int dtlsts = dtllst.get(0).getBatSts(); |
| 461 | 453 | |
| 462 | - if (LOGGER.isDebugEnabled()) { | |
| 463 | - LOGGER.debug("JOB_SEQ:" + this.jobSeq); | |
| 464 | - LOGGER.debug("JOB_DTL_SEQ:" + dtlno); | |
| 465 | - LOGGER.debug("JOB_DTL_STS:" + dtlsts); | |
| 466 | - } | |
| 454 | + LogManager.getLogger().debug("JOB_SEQ:" + this.jobSeq); | |
| 455 | + LogManager.getLogger().debug("JOB_DTL_SEQ:" + dtlno); | |
| 456 | + LogManager.getLogger().debug("JOB_DTL_STS:" + dtlsts); | |
| 467 | 457 | |
| 468 | 458 | // ジョブ詳細管理が処理中のとき |
| 469 | 459 | if (JobState.ID_B_EDIT.value() == dtlsts) { |
| @@ -144,7 +144,7 @@ | ||
| 144 | 144 | "rmi://" + hostId + JobManager.BATCH_BIND_NAME)); |
| 145 | 145 | } else { |
| 146 | 146 | String lookup = toBatchUri("rmi://" + hostId, JobManager.BATCH_BIND_NAME); |
| 147 | - LogManager.getLogger(JobRequestor.class).debug("cancel lookup={}", lookup); | |
| 147 | + LogManager.getLogger().debug("cancel lookup={}", lookup); | |
| 148 | 148 | |
| 149 | 149 | jm = JobManager.class.cast(java.rmi.Naming.lookup(lookup)); |
| 150 | 150 | } |
| @@ -28,7 +28,6 @@ | ||
| 28 | 28 | import javax.rmi.ssl.SslRMIServerSocketFactory; |
| 29 | 29 | |
| 30 | 30 | import org.apache.logging.log4j.LogManager; |
| 31 | -import org.apache.logging.log4j.Logger; | |
| 32 | 31 | |
| 33 | 32 | import batch.status.Job; |
| 34 | 33 | import batch.status.JobDetail; |
| @@ -37,9 +36,7 @@ | ||
| 37 | 36 | import batch.status.JobMasterInfo; |
| 38 | 37 | import batch.status.JobState; |
| 39 | 38 | import batch.status.JobStatus; |
| 40 | - | |
| 41 | 39 | import common.db.jdbc.Jdbc; |
| 42 | - | |
| 43 | 40 | import core.config.Env; |
| 44 | 41 | import core.config.Factory; |
| 45 | 42 | import core.exception.PhysicalException; |
| @@ -59,9 +56,6 @@ | ||
| 59 | 56 | /** serialVersionUID */ |
| 60 | 57 | private static final long serialVersionUID = 4825560113231843758L; |
| 61 | 58 | |
| 62 | - /** ログ出力用クラス */ | |
| 63 | - private static final Logger LOGGER = LogManager.getLogger(JobManagerImpl.class); | |
| 64 | - | |
| 65 | 59 | /** ジョブ拡張子 */ |
| 66 | 60 | private static final String ENV_BATCH_SUFFIX = "Batch.Suffix"; |
| 67 | 61 | /** バッチ起動最大数 */ |
| @@ -84,7 +78,7 @@ | ||
| 84 | 78 | public JobManagerImpl() throws RemoteException { |
| 85 | 79 | // 最大実行ジョブ数取得 |
| 86 | 80 | this.maxProc = Env.getEnv(ENV_BATCH_MAXPROCS, 20); |
| 87 | - LOGGER.info("MaxProc={}", String.valueOf(this.maxProc)); | |
| 81 | + LogManager.getLogger().info("MaxProc={}", String.valueOf(this.maxProc)); | |
| 88 | 82 | } |
| 89 | 83 | |
| 90 | 84 | /** |
| @@ -132,7 +126,7 @@ | ||
| 132 | 126 | // 終了タイプ取得 |
| 133 | 127 | String type = MapUtil.get(jobid, this.jobMasterMap, JobMaster::getCancelType, () -> ""); |
| 134 | 128 | |
| 135 | - LOGGER.debug("type={}", type); | |
| 129 | + LogManager.getLogger().debug("type={}", type); | |
| 136 | 130 | |
| 137 | 131 | if (!BooleanUtil.toBool(type)) { |
| 138 | 132 | return; |
| @@ -142,16 +136,6 @@ | ||
| 142 | 136 | JobDetailStatus jds = Factory.create(JobDetailStatus.class); |
| 143 | 137 | List<JobDetail> l = jds.selectJobDetails(conn, jobseq); |
| 144 | 138 | |
| 145 | - if (LOGGER.isDebugEnabled()) { | |
| 146 | - if (l == null) { | |
| 147 | - LOGGER.debug("l is null."); | |
| 148 | - } else if (l.isEmpty()) { | |
| 149 | - LOGGER.debug("l is zero."); | |
| 150 | - } else { | |
| 151 | - LOGGER.debug("job detail status={}", String.valueOf(l.get(0).getBatSts())); | |
| 152 | - } | |
| 153 | - } | |
| 154 | - | |
| 155 | 139 | if (l == null || l.isEmpty() || JobState.ID_B_EDIT.value() != l.get(0).getBatSts()) { |
| 156 | 140 | return; |
| 157 | 141 | } |
| @@ -159,7 +143,8 @@ | ||
| 159 | 143 | // 中止コマンド作成 |
| 160 | 144 | String cmd = Env.getEnv(ENV_BATCH_KILL); |
| 161 | 145 | |
| 162 | - LOGGER.debug("job detail status={} command={}", String.valueOf(l.get(0).getBatSts()), cmd); | |
| 146 | + LogManager.getLogger().debug("job detail status={} command={}", | |
| 147 | + String.valueOf(l.get(0).getBatSts()), cmd); | |
| 163 | 148 | |
| 164 | 149 | if (!Objects.toString(cmd, "").trim().isEmpty()) { |
| 165 | 150 | // ジョブ中止処理 |
| @@ -168,7 +153,7 @@ | ||
| 168 | 153 | } catch (final IOException ex) { |
| 169 | 154 | LogManager.getLogger().warn(ex.getMessage(), ex); |
| 170 | 155 | } finally { |
| 171 | - LOGGER.debug("executed={}", cmd); | |
| 156 | + LogManager.getLogger().debug("executed={}", cmd); | |
| 172 | 157 | } |
| 173 | 158 | } |
| 174 | 159 | } |
| @@ -179,7 +164,7 @@ | ||
| 179 | 164 | */ |
| 180 | 165 | @Override |
| 181 | 166 | public void run() { |
| 182 | - LOGGER.info("JobManager Thread Start."); | |
| 167 | + LogManager.getLogger().info("JobManager Thread Start."); | |
| 183 | 168 | |
| 184 | 169 | // ポーリング処理 |
| 185 | 170 | try { |
| @@ -190,7 +175,7 @@ | ||
| 190 | 175 | throw new PhysicalException(ex); |
| 191 | 176 | } |
| 192 | 177 | |
| 193 | - LOGGER.info("JobManager Thread End."); | |
| 178 | + LogManager.getLogger().info("JobManager Thread End."); | |
| 194 | 179 | } |
| 195 | 180 | |
| 196 | 181 | /** |
| @@ -232,7 +217,7 @@ | ||
| 232 | 217 | List<Job> queue = js.getJobListByStatus(conn, null, JobState.requested()); |
| 233 | 218 | |
| 234 | 219 | // 最大実行ジョブ数になるか、処理依頼中がなくなるまでプロセス起動 |
| 235 | - LOGGER.debug("RequestCount={}", String.valueOf(queue.size())); | |
| 220 | + LogManager.getLogger().debug("RequestCount={}", String.valueOf(queue.size())); | |
| 236 | 221 | |
| 237 | 222 | // 現在時刻取得 |
| 238 | 223 | String now = DateUtil.format(new Date(), "HHmm"); |
| @@ -345,7 +330,7 @@ | ||
| 345 | 330 | // バッチ起動シェルコマンド作成 |
| 346 | 331 | String suffix = Env.getEnv(ENV_BATCH_SUFFIX); |
| 347 | 332 | |
| 348 | - LOGGER.debug("{}{} {} {} ", jid, suffix, ID_B_ONLINE_OPTION, String.valueOf(jobseq)); | |
| 333 | + LogManager.getLogger().debug("{}{} {} {} ", jid, suffix, ID_B_ONLINE_OPTION, String.valueOf(jobseq)); | |
| 349 | 334 | |
| 350 | 335 | // バッチ起動処理 |
| 351 | 336 | List<String> cmd = new ArrayList<>(); |
| @@ -414,7 +399,7 @@ | ||
| 414 | 399 | Naming.rebind(JobRequestor.toBatchUri("//localhost", BATCH_BIND_NAME), jm); |
| 415 | 400 | } |
| 416 | 401 | |
| 417 | - LOGGER.debug("End Bind"); | |
| 402 | + LogManager.getLogger().debug("End Bind"); | |
| 418 | 403 | |
| 419 | 404 | } catch (final RemoteException | MalformedURLException ex) { |
| 420 | 405 | ThrowableUtil.error(ex); |
| @@ -255,7 +255,7 @@ | ||
| 255 | 255 | |
| 256 | 256 | String p = Objects.toString(path, ""); |
| 257 | 257 | // 作成ファイルの削除 |
| 258 | - LogManager.getLogger(JobFileStatusImpl.class).warn("remove path={} file={}", p, fname); | |
| 258 | + LogManager.getLogger().warn("remove path={} file={}", p, fname); | |
| 259 | 259 | File f = new File(p, fname); |
| 260 | 260 | return f.delete(); |
| 261 | 261 | } |
| @@ -12,10 +12,8 @@ | ||
| 12 | 12 | import java.util.Map; |
| 13 | 13 | |
| 14 | 14 | import org.apache.logging.log4j.LogManager; |
| 15 | -import org.apache.logging.log4j.Logger; | |
| 16 | 15 | |
| 17 | 16 | import common.sql.QueryUtil; |
| 18 | - | |
| 19 | 17 | import core.exception.PhysicalException; |
| 20 | 18 | import core.exception.ThrowableUtil; |
| 21 | 19 |
| @@ -26,8 +24,6 @@ | ||
| 26 | 24 | * @version 1.0.0 |
| 27 | 25 | */ |
| 28 | 26 | public final class JobDetailStatusImpl implements JobDetailStatus { |
| 29 | - /** ログ出力用クラス */ | |
| 30 | - private static final Logger LOGGER = LogManager.getLogger(JobDetailStatusImpl.class); | |
| 31 | 27 | |
| 32 | 28 | /** |
| 33 | 29 | * ジョブ詳細管理状態取得 |
| @@ -70,8 +66,8 @@ | ||
| 70 | 66 | public List<JobDetail> selectJobDetails(final Connection conn, final long seq) { |
| 71 | 67 | // 読込 |
| 72 | 68 | String query = QueryUtil.getSqlFromFile("SelectJobDetailStatusList", this.getClass()); |
| 73 | - LOGGER.debug(query); | |
| 74 | - LOGGER.debug("jobseq={}", String.valueOf(seq)); | |
| 69 | + LogManager.getLogger().debug(query); | |
| 70 | + LogManager.getLogger().debug("jobseq={}", String.valueOf(seq)); | |
| 75 | 71 | |
| 76 | 72 | try (PreparedStatement psmt = QueryUtil.statementReadonly( |
| 77 | 73 | conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) { |