• 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

Revision80 (tree)
Time2015-08-23 13:44:12
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/fwBatch/src/batch/base/BatchParameterImpl.java (revision 79)
+++ trunk/framework/fwBatch/src/batch/base/BatchParameterImpl.java (revision 80)
@@ -89,8 +89,7 @@
8989
9090 try (Connection conn = JobUtil.getConnection()) {
9191 // ジョブ管理テーブルのパラメタを取得
92- LogManager.getLogger(BatchParameterImpl.class).info(
93- "jobseq={}", String.valueOf(this.jobSeq));
92+ LogManager.getLogger().info("jobseq={}", String.valueOf(this.jobSeq));
9493 Job job = js.getJobWithLock(conn, this.jobSeq);
9594 // パラメタ設定
9695 setJobName(job.getJobName());
--- trunk/framework/fwBatch/src/batch/base/BatchStatus.java (revision 79)
+++ trunk/framework/fwBatch/src/batch/base/BatchStatus.java (revision 80)
@@ -12,7 +12,6 @@
1212 import java.util.concurrent.TimeUnit;
1313
1414 import org.apache.logging.log4j.LogManager;
15-import org.apache.logging.log4j.Logger;
1615
1716 import batch.controller.JobUtil;
1817 import batch.status.Job;
@@ -44,9 +43,6 @@
4443 /** 起動パラメタ(バッチジョブクリア) */
4544 public static final String JOB_CLEAR = "-clear";
4645
47- /** ログ出力用クラス */
48- private static final Logger LOGGER = LogManager.getLogger(BatchStatus.class);
49-
5046 /** 削除対象日付(日数)のデフォルト値 */
5147 private int interval = 6;
5248 /** ジョブID */
@@ -218,9 +214,7 @@
218214 * @return バッチ終了ステータス
219215 */
220216 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));
224218
225219 int ret = Batch.RET_SUCCESS;
226220 try (Connection conn = JobUtil.getConnection()) {
@@ -296,9 +290,7 @@
296290 * @return バッチ終了ステータス
297291 */
298292 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));
302294
303295 int ret = Batch.RET_FAILED;
304296 try (Connection conn = JobUtil.getConnection()) {
@@ -408,7 +400,7 @@
408400 // ジョブ詳細管理状態取得
409401 List<JobDetail> dtllst = updateJobDetail(conn, job.getJobSts());
410402 if (dtllst == null || dtllst.isEmpty()) {
411- LOGGER.info("detail list is empty.");
403+ LogManager.getLogger().info("detail list is empty.");
412404 job.setMsgTxt("");
413405 job.setJobSts(JobState.ID_B_INVALID.value());
414406 return Batch.RET_SUCCESS;
@@ -459,11 +451,9 @@
459451 int dtlno = dtllst.size();
460452 int dtlsts = dtllst.get(0).getBatSts();
461453
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);
467457
468458 // ジョブ詳細管理が処理中のとき
469459 if (JobState.ID_B_EDIT.value() == dtlsts) {
--- trunk/framework/fwBatch/src/batch/controller/JobRequestor.java (revision 79)
+++ trunk/framework/fwBatch/src/batch/controller/JobRequestor.java (revision 80)
@@ -144,7 +144,7 @@
144144 "rmi://" + hostId + JobManager.BATCH_BIND_NAME));
145145 } else {
146146 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);
148148
149149 jm = JobManager.class.cast(java.rmi.Naming.lookup(lookup));
150150 }
--- trunk/framework/fwBatch/src/batch/controller/JobManagerImpl.java (revision 79)
+++ trunk/framework/fwBatch/src/batch/controller/JobManagerImpl.java (revision 80)
@@ -28,7 +28,6 @@
2828 import javax.rmi.ssl.SslRMIServerSocketFactory;
2929
3030 import org.apache.logging.log4j.LogManager;
31-import org.apache.logging.log4j.Logger;
3231
3332 import batch.status.Job;
3433 import batch.status.JobDetail;
@@ -37,9 +36,7 @@
3736 import batch.status.JobMasterInfo;
3837 import batch.status.JobState;
3938 import batch.status.JobStatus;
40-
4139 import common.db.jdbc.Jdbc;
42-
4340 import core.config.Env;
4441 import core.config.Factory;
4542 import core.exception.PhysicalException;
@@ -59,9 +56,6 @@
5956 /** serialVersionUID */
6057 private static final long serialVersionUID = 4825560113231843758L;
6158
62- /** ログ出力用クラス */
63- private static final Logger LOGGER = LogManager.getLogger(JobManagerImpl.class);
64-
6559 /** ジョブ拡張子 */
6660 private static final String ENV_BATCH_SUFFIX = "Batch.Suffix";
6761 /** バッチ起動最大数 */
@@ -84,7 +78,7 @@
8478 public JobManagerImpl() throws RemoteException {
8579 // 最大実行ジョブ数取得
8680 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));
8882 }
8983
9084 /**
@@ -132,7 +126,7 @@
132126 // 終了タイプ取得
133127 String type = MapUtil.get(jobid, this.jobMasterMap, JobMaster::getCancelType, () -> "");
134128
135- LOGGER.debug("type={}", type);
129+ LogManager.getLogger().debug("type={}", type);
136130
137131 if (!BooleanUtil.toBool(type)) {
138132 return;
@@ -142,16 +136,6 @@
142136 JobDetailStatus jds = Factory.create(JobDetailStatus.class);
143137 List<JobDetail> l = jds.selectJobDetails(conn, jobseq);
144138
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-
155139 if (l == null || l.isEmpty() || JobState.ID_B_EDIT.value() != l.get(0).getBatSts()) {
156140 return;
157141 }
@@ -159,7 +143,8 @@
159143 // 中止コマンド作成
160144 String cmd = Env.getEnv(ENV_BATCH_KILL);
161145
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);
163148
164149 if (!Objects.toString(cmd, "").trim().isEmpty()) {
165150 // ジョブ中止処理
@@ -168,7 +153,7 @@
168153 } catch (final IOException ex) {
169154 LogManager.getLogger().warn(ex.getMessage(), ex);
170155 } finally {
171- LOGGER.debug("executed={}", cmd);
156+ LogManager.getLogger().debug("executed={}", cmd);
172157 }
173158 }
174159 }
@@ -179,7 +164,7 @@
179164 */
180165 @Override
181166 public void run() {
182- LOGGER.info("JobManager Thread Start.");
167+ LogManager.getLogger().info("JobManager Thread Start.");
183168
184169 // ポーリング処理
185170 try {
@@ -190,7 +175,7 @@
190175 throw new PhysicalException(ex);
191176 }
192177
193- LOGGER.info("JobManager Thread End.");
178+ LogManager.getLogger().info("JobManager Thread End.");
194179 }
195180
196181 /**
@@ -232,7 +217,7 @@
232217 List<Job> queue = js.getJobListByStatus(conn, null, JobState.requested());
233218
234219 // 最大実行ジョブ数になるか、処理依頼中がなくなるまでプロセス起動
235- LOGGER.debug("RequestCount={}", String.valueOf(queue.size()));
220+ LogManager.getLogger().debug("RequestCount={}", String.valueOf(queue.size()));
236221
237222 // 現在時刻取得
238223 String now = DateUtil.format(new Date(), "HHmm");
@@ -345,7 +330,7 @@
345330 // バッチ起動シェルコマンド作成
346331 String suffix = Env.getEnv(ENV_BATCH_SUFFIX);
347332
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));
349334
350335 // バッチ起動処理
351336 List<String> cmd = new ArrayList<>();
@@ -414,7 +399,7 @@
414399 Naming.rebind(JobRequestor.toBatchUri("//localhost", BATCH_BIND_NAME), jm);
415400 }
416401
417- LOGGER.debug("End Bind");
402+ LogManager.getLogger().debug("End Bind");
418403
419404 } catch (final RemoteException | MalformedURLException ex) {
420405 ThrowableUtil.error(ex);
--- trunk/framework/fwBatch/src/batch/status/JobFileStatusImpl.java (revision 79)
+++ trunk/framework/fwBatch/src/batch/status/JobFileStatusImpl.java (revision 80)
@@ -255,7 +255,7 @@
255255
256256 String p = Objects.toString(path, "");
257257 // 作成ファイルの削除
258- LogManager.getLogger(JobFileStatusImpl.class).warn("remove path={} file={}", p, fname);
258+ LogManager.getLogger().warn("remove path={} file={}", p, fname);
259259 File f = new File(p, fname);
260260 return f.delete();
261261 }
--- trunk/framework/fwBatch/src/batch/status/JobDetailStatusImpl.java (revision 79)
+++ trunk/framework/fwBatch/src/batch/status/JobDetailStatusImpl.java (revision 80)
@@ -12,10 +12,8 @@
1212 import java.util.Map;
1313
1414 import org.apache.logging.log4j.LogManager;
15-import org.apache.logging.log4j.Logger;
1615
1716 import common.sql.QueryUtil;
18-
1917 import core.exception.PhysicalException;
2018 import core.exception.ThrowableUtil;
2119
@@ -26,8 +24,6 @@
2624 * @version 1.0.0
2725 */
2826 public final class JobDetailStatusImpl implements JobDetailStatus {
29- /** ログ出力用クラス */
30- private static final Logger LOGGER = LogManager.getLogger(JobDetailStatusImpl.class);
3127
3228 /**
3329 * ジョブ詳細管理状態取得
@@ -70,8 +66,8 @@
7066 public List<JobDetail> selectJobDetails(final Connection conn, final long seq) {
7167 // 読込
7268 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));
7571
7672 try (PreparedStatement psmt = QueryUtil.statementReadonly(
7773 conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {