Shinsuke Sugaya 9 лет назад
Родитель
Сommit
626620c08d

+ 15 - 15
src/main/resources/mail/crawler.dfmail

@@ -5,29 +5,29 @@
 subject: [FESS] Crawler completed: /*pmb.hostname*/
 >>>
 --- Server Info ---
-Host Name: /*IF pmb.hostname != null*//*pmb.hostname*//*END*//*IF pmb.hostname == null*/Unknown/*END*/
+Host Name: /*pmb.hostname:orElse('Unknown')*/
 
 --- Web/FileSystem Crawler ---
-Start Time: /*pmb.webFsCrawlStartTime*/
-End Time:   /*pmb.webFsCrawlEndTime*/
-Exec Time:  /*pmb.webFsCrawlExecTime*/ ms
+Start Time: /*pmb.webFsCrawlStartTime:orElse('-')*/
+End Time:   /*pmb.webFsCrawlEndTime:orElse('-')*/
+Exec Time:  /*pmb.webFsCrawlExecTime:orElse('-')*/ ms
 
 --- Web/FileSystem Indexer ---
-Exec Time:  /*pmb.webFsIndexExecTime*/ ms
-Num of Doc: /*pmb.webFsIndexSize*/ docs
+Exec Time:  /*pmb.webFsIndexExecTime:orElse('-')*/ ms
+Num of Doc: /*pmb.webFsIndexSize:orElse('-')*/ docs
 
 --- Data Store Crawler ---
-Start Time: /*pmb.dataCrawlStartTime*/
-End Time:   /*pmb.dataCrawlEndTime*/
-Exec Time:  /*pmb.dataCrawlExecTime*/ ms
+Start Time: /*pmb.dataCrawlStartTime:orElse('-')*/
+End Time:   /*pmb.dataCrawlEndTime:orElse('-')*/
+Exec Time:  /*pmb.dataCrawlExecTime:orElse('-')*/ ms
 
 --- Data Store Indexer ---
-Exec Time:  /*pmb.dataIndexExecTime*/ ms
-Num of Doc: /*pmb.dataFsIndexSize*/ docs
+Exec Time:  /*pmb.dataIndexExecTime:orElse('-')*/ ms
+Num of Doc: /*pmb.dataFsIndexSize:orElse('-')*/ docs
 
 --- Total ---
-Start Time: /*pmb.crawlerStartTime*/
-End Time:   /*pmb.crawlerEndTime*/
-Exec Time:  /*pmb.crawlerExecTime*/ ms
-Status:     /*pmb.status*/
+Start Time: /*pmb.crawlerStartTime:orElse('-')*/
+End Time:   /*pmb.crawlerEndTime:orElse('-')*/
+Exec Time:  /*pmb.crawlerExecTime:orElse('-')*/ ms
+Status:     /*pmb.status:orElse('-')*/
 

+ 3 - 2
src/main/resources/mail/es_status.dfmail

@@ -1,10 +1,11 @@
 /*
  [Crawler Notification]
 */
-subject: [FESS] Status Change: /*pmb.hostname*/
+subject: [FESS] Status Change: /*pmb.hostname:orElse('Unknown')*/
 >>>
 --- Server Info ---
-Host Name: /*IF pmb.hostname != null*//*pmb.hostname*//*END*//*IF pmb.hostname == null*/Unknown/*END*/
+Host Name: /*pmb.hostname:orElse('Unknown')*/
+
 Elasticsearch: /*pmb.server*/
 
 --- Status ---

+ 2 - 2
src/main/resources/mail/testmail.dfmail

@@ -1,7 +1,7 @@
 /*
  [Test Mail]
 */
-subject: [FESS] Test Mail: /*pmb.hostname*/
+subject: [FESS] Test Mail: /*pmb.hostname:orElse('Unknown')*/
 >>>
-This is a test mail from /*pmb.hostname*/
+This is a test mail from /*pmb.hostname:orElse('Unknown')*/