[griffin] branch master updated: add placeholder for cron expression

[guoyp]

This is an automated email from the ASF dual-hosted git repository.

guoyp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/griffin.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f3caa5  add placeholder for cron expression
4f3caa5 is described below

commit 4f3caa57b9dc8470f631aa62bc2994fb61bf089c
Author: jasonliaoxiaoge <181276...@qq.com>
AuthorDate: Thu Sep 26 22:53:27 2019 +0800

    add placeholder for cron expression
    
    add placeholder for cron expression, cause java quartz is a little 
difference from crontab in linux
    
    Author: jasonliaoxiaoge <181276...@qq.com>
    
    Closes #503 from jasonliaoxiaoge/master.
---
 .../java/org/apache/griffin/core/job/BatchJobOperatorImpl.java   | 9 ++++-----
 ui/angular/src/app/job/create-job/batch/batch.component.html     | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java 
b/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
index 03b7a8e..b46ea8b 100644
--- 
a/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
+++ 
b/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
@@ -317,7 +317,6 @@ public class BatchJobOperatorImpl implements JobOperator {
 
     private boolean pauseJobInstance(JobInstanceBean instance,
                                      List<JobInstanceBean> deletedInstances) {
-        boolean status = true;
         String pGroup = instance.getPredicateGroup();
         String pName = instance.getPredicateName();
         try {
@@ -328,10 +327,10 @@ public class BatchJobOperatorImpl implements JobOperator {
             }
         } catch (SchedulerException e) {
             LOGGER.error("Failed to pause predicate job({},{}).", pGroup,
-                pName);
-            status = false;
+                    pName);
+            return false;
         }
-        return status;
+        return true;
     }
 
     private void validateParams(AbstractJob job, GriffinMeasure measure) {
@@ -359,7 +358,7 @@ public class BatchJobOperatorImpl implements JobOperator {
             return false;
         }
         if (!isValidExpression(cronExpression)) {
-            LOGGER.warn("Cron Expression is invalid.");
+            LOGGER.warn("Cron Expression is invalid: {}", cronExpression);
             return false;
         }
         return true;
diff --git a/ui/angular/src/app/job/create-job/batch/batch.component.html 
b/ui/angular/src/app/job/create-job/batch/batch.component.html
index 91026f4..14f8a52 100644
--- a/ui/angular/src/app/job/create-job/batch/batch.component.html
+++ b/ui/angular/src/app/job/create-job/batch/batch.component.html
@@ -69,7 +69,8 @@ under the License.
                       Cron Expression<span class="symbol required"></span>:
                     </label>
                     <div class="col-md-10 col-lg-10 col-sm-10 ">
-                      <input class="form-control" ngControl="name" required 
[(ngModel)]="cronExp" name="cronExp">
+                      <input class="form-control" ngControl="name" required 
[(ngModel)]="cronExp" name="cronExp"
+                             placeholder="Quartz format:[Seconds] [Minutes] 
[Hours] [Day of month] [Month] [Day of week] [Year(Optional)]">
                     </div>
                   </div>
                 </div>