Commit e0c9d685 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/nifi into dev

parents c5b0dfd2 afa9805a
Loading
Loading
Loading
Loading
+16 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ flowFile = session.write(flowFile, { inputStream, outputStream ->
	def inJson = new JsonSlurper().parseText(content)

	// Read config from file
	def config = getConfigFile()
	def config = getConfigFile(flowFile)

	def sensors = inJson["sensors"]
	def toRemove = []
@@ -78,9 +78,21 @@ flowFile = session.write(flowFile, { inputStream, outputStream ->

session.transfer(flowFile, REL_SUCCESS)

def getConfigFile() {
	// Read config from file
	String configFile = new File(binding.getVariable("configFilePath").value).getText("UTF-8")
def getConfigFile(flowFile) {

	def attrName = "configFilePath"

	def attr = null
	// Read config from variables
	try {
		attr = binding.getVariable(attrName).evaluateAttributeExpressions(flowFile).value
	}
	catch(Exception ex) {}

	if (attr == null) // if is null, read config from attributes
		attr = flowFile.getAttribute(attrName)

	def configFile = new File(attr).getText("UTF-8")

	return new JsonSlurper().parseText(configFile)
}
+569 −0

File added.

Preview size limit exceeded, changes collapsed.

+1848 −0

File added.

Preview size limit exceeded, changes collapsed.