diff --git a/.gitignore b/.gitignore index 4740d15a..36df3e98 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,7 @@ /local/local-upload-stow-log.json /config/raccoon-dimse-app.json -/pm2log +/config/logback.xml +/pm2log/** +!pm2log/.gitkeep config/ae-prod.properties \ No newline at end of file diff --git a/dimse/index.js b/dimse/index.js index 6acaf5d0..5b39ae58 100644 --- a/dimse/index.js +++ b/dimse/index.js @@ -2,6 +2,7 @@ const _ = require("lodash"); const { java } = require("@models/DICOM/dcm4che/java-instance"); const { importClass } = require("java-bridge"); const path = require("path"); +const fs = require("fs"); const { ApplicationEntity } = require("@dcm4che/net/ApplicationEntity"); const { BasicCEchoSCP } = require("@dcm4che/net/service/BasicCEchoSCP"); @@ -21,7 +22,8 @@ const { JsCGetScp } = require("./c-get"); const { JsStgCmtScp } = require("./stgcmt"); const { raccoonConfig } = require("@root/config-class"); const { Connection$EndpointIdentificationAlgorithm } = require("@dcm4che/net/Connection$EndpointIdentificationAlgorithm"); -const { default: SSLManagerFactory } = require("@dcm4che/net/SSLManagerFactory"); +const { SSLManagerFactory } = require("@dcm4che/net/SSLManagerFactory"); +const { Common } = require("@chinlinlee/dcm777/common/Common"); class DcmQrScp { device = new Device("dcmqrscp"); @@ -75,6 +77,7 @@ class DcmQrScp { async start() { + this.configureLog(); this.configureConnection(); this.configureBindServer(); this.configureTransferCapability(); @@ -274,6 +277,52 @@ class DcmQrScp { return this.connection.isTlsSync(); } + + configureLog() { + this.generateLogFile(); + Common.LoadLogConfigSync( + path.join( + __dirname, + "../config/logback.xml" + ) + ); + } + + generateLogFile() { + let logBackXml = ` + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf-8 + + ${path.normalize(path.join(__dirname, "../pm2log/raccoon.log"))} + + ${path.normalize(path.join(__dirname, "../pm2log/raccoon.log"))}%i + + + 1MB + + + + + + + + `; + + fs.writeFileSync(path.join( + __dirname, + "../config/logback.xml" + ), logBackXml, "utf-8"); + } } module.exports.DcmQrScp = DcmQrScp; \ No newline at end of file diff --git a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/logback-classic-1.4.8.jar b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/logback-classic-1.4.8.jar new file mode 100644 index 00000000..a1ea9812 Binary files /dev/null and b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/logback-classic-1.4.8.jar differ diff --git a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/logback-core-1.4.8.jar b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/logback-core-1.4.8.jar new file mode 100644 index 00000000..48983b26 Binary files /dev/null and b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/logback-core-1.4.8.jar differ diff --git a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/qrscp/dcm777-5.29.2.jar b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/qrscp/dcm777-5.29.2.jar index 2810b047..dcd6b6ef 100644 Binary files a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/qrscp/dcm777-5.29.2.jar and b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/qrscp/dcm777-5.29.2.jar differ diff --git a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-api-1.7.32.jar b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-api-1.7.32.jar deleted file mode 100644 index b16a0785..00000000 Binary files a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-api-1.7.32.jar and /dev/null differ diff --git a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-api-2.0.7.jar b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-api-2.0.7.jar new file mode 100644 index 00000000..be5447c4 Binary files /dev/null and b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-api-2.0.7.jar differ diff --git a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-simple-1.7.32.jar b/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-simple-1.7.32.jar deleted file mode 100644 index ea0ee435..00000000 Binary files a/models/DICOM/dcm4che/javaNode/dcm4chee/lib/slf4j-simple-1.7.32.jar and /dev/null differ diff --git a/pm2log/.gitkeep b/pm2log/.gitkeep new file mode 100644 index 00000000..e69de29b