1.增加grok相关的校验

qiniu · Oct 17, 2017 · cb57cad · cb57cad
1 parent 00dbadc
commit cb57cad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/logkitweb/src/components/parserConfig.js b/logkitweb/src/components/parserConfig.js
@@ -227,7 +227,9 @@ class Parser extends Component {
     const {getFieldsValue} = this.props.form;
     let data = getFieldsValue();
     if (this.state.currentOption === 'grok') {
-      data[this.state.currentOption].grok_custom_patterns = window.btoa(data[this.state.currentOption].grok_custom_patterns)
+      if (data[this.state.currentOption].grok_custom_patterns != '' && data[this.state.currentOption].grok_custom_patterns != undefined) {
+        data[this.state.currentOption].grok_custom_patterns = window.btoa(data[this.state.currentOption].grok_custom_patterns)
+      }
     }
     const requestData = {
       type: this.state.currentOption,

diff --git a/logkitweb/src/createContainer.js b/logkitweb/src/createContainer.js
@@ -116,7 +116,10 @@ class Create extends Component {
           }
           let nodeData = config.getNodeData()
           if (nodeData && nodeData.parser.type === 'grok') {
-            nodeData.parser.grok_custom_patterns = window.btoa(nodeData.parser.grok_custom_patterns)
+            if (nodeData.parser.grok_custom_patterns != '' && nodeData.parser.grok_custom_patterns != undefined) {
+              nodeData.parser.grok_custom_patterns = window.btoa(nodeData.parser.grok_custom_patterns)
+            }
+
           }
 
           let data = {