|
24 | 24 | import io.siddhi.annotation.ParameterOverload;
|
25 | 25 | import io.siddhi.annotation.util.DataType;
|
26 | 26 | import io.siddhi.core.config.SiddhiQueryContext;
|
27 |
| -import io.siddhi.core.event.ComplexEvent; |
28 | 27 | import io.siddhi.core.event.ComplexEventChunk;
|
29 | 28 | import io.siddhi.core.event.stream.MetaStreamEvent;
|
30 | 29 | import io.siddhi.core.event.stream.StreamEvent;
|
@@ -221,52 +220,54 @@ protected void process(ComplexEventChunk<StreamEvent> streamEventChunk, Processo
|
221 | 220 | StreamEventCloner streamEventCloner, ComplexEventPopulater complexEventPopulater,
|
222 | 221 | State state) {
|
223 | 222 | while (streamEventChunk.hasNext()) {
|
224 |
| - ComplexEvent complexEvent = streamEventChunk.next(); |
| 223 | + StreamEvent streamEvent = streamEventChunk.next(); |
225 | 224 | switch (attributeExpressionLength) {
|
226 | 225 | case 0:
|
227 |
| - log.info(logPrefix + complexEvent); |
| 226 | + log.info(logPrefix + streamEvent.toString(1)); |
228 | 227 | break;
|
229 | 228 | case 1:
|
230 | 229 | if (isLogEventExpressionExecutor != null) {
|
231 |
| - if ((Boolean) isLogEventExpressionExecutor.execute(complexEvent)) { |
232 |
| - log.info(logPrefix + complexEvent); |
| 230 | + if ((Boolean) isLogEventExpressionExecutor.execute(streamEvent)) { |
| 231 | + log.info(logPrefix + streamEvent.toString(1)); |
233 | 232 | } else {
|
234 | 233 | log.info(logPrefix + "Event Arrived");
|
235 | 234 | }
|
236 | 235 | } else {
|
237 |
| - log.info(logPrefix + logMessageExpressionExecutor.execute(complexEvent) + ", " + complexEvent); |
| 236 | + log.info(logPrefix + logMessageExpressionExecutor.execute(streamEvent) + ", " + |
| 237 | + streamEvent.toString(1)); |
238 | 238 | }
|
239 | 239 | break;
|
240 | 240 | case 2:
|
241 | 241 | if (isLogEventExpressionExecutor != null) {
|
242 |
| - if ((Boolean) isLogEventExpressionExecutor.execute(complexEvent)) { |
243 |
| - log.info(logPrefix + logMessageExpressionExecutor.execute(complexEvent) + ", " + |
244 |
| - complexEvent); |
| 242 | + if ((Boolean) isLogEventExpressionExecutor.execute(streamEvent)) { |
| 243 | + log.info(logPrefix + logMessageExpressionExecutor.execute(streamEvent) + ", " + |
| 244 | + streamEvent.toString(1)); |
245 | 245 | } else {
|
246 |
| - log.info(logPrefix + logMessageExpressionExecutor.execute(complexEvent)); |
| 246 | + log.info(logPrefix + logMessageExpressionExecutor.execute(streamEvent)); |
247 | 247 | }
|
248 | 248 | } else {
|
249 | 249 | LogPriority tempLogPriority = logPriority;
|
250 | 250 | if (logPriorityExpressionExecutor != null) {
|
251 |
| - tempLogPriority = LogPriority.valueOf((String) logPriorityExpressionExecutor.execute |
252 |
| - (complexEvent)); |
| 251 | + tempLogPriority = LogPriority.valueOf((String) logPriorityExpressionExecutor. |
| 252 | + execute(streamEvent)); |
253 | 253 | }
|
254 |
| - String message = logPrefix + logMessageExpressionExecutor.execute(complexEvent) + ", " + |
255 |
| - complexEvent; |
| 254 | + String message = logPrefix + logMessageExpressionExecutor.execute(streamEvent) + ", " + |
| 255 | + streamEvent.toString(1); |
256 | 256 | logMessage(tempLogPriority, message);
|
257 | 257 | }
|
258 | 258 | break;
|
259 | 259 | default:
|
260 | 260 | String message;
|
261 |
| - if ((Boolean) isLogEventExpressionExecutor.execute(complexEvent)) { |
262 |
| - message = logPrefix + logMessageExpressionExecutor.execute(complexEvent) + ", " + complexEvent; |
| 261 | + if ((Boolean) isLogEventExpressionExecutor.execute(streamEvent)) { |
| 262 | + message = logPrefix + logMessageExpressionExecutor.execute(streamEvent) + ", " + |
| 263 | + streamEvent.toString(1); |
263 | 264 | } else {
|
264 |
| - message = logPrefix + logMessageExpressionExecutor.execute(complexEvent); |
| 265 | + message = logPrefix + logMessageExpressionExecutor.execute(streamEvent); |
265 | 266 | }
|
266 | 267 | LogPriority tempLogPriority = logPriority;
|
267 | 268 | if (logPriorityExpressionExecutor != null) {
|
268 |
| - tempLogPriority = LogPriority.valueOf((String) logPriorityExpressionExecutor.execute |
269 |
| - (complexEvent)); |
| 269 | + tempLogPriority = LogPriority.valueOf((String) logPriorityExpressionExecutor. |
| 270 | + execute(streamEvent)); |
270 | 271 | }
|
271 | 272 | logMessage(tempLogPriority, message);
|
272 | 273 | }
|
|
0 commit comments