Skip to content

Issue 228: global fileName does not get set properly #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arctan5x merged 1 commit into from
Jun 5, 2019
Merged

Issue 228: global fileName does not get set properly #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions splunk_eventgen/lib/eventgenconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,14 @@ def parse(self):
# Override <SAMPLE> with real name
if s.outputMode == 'spool' and s.spoolFile == self.spoolFile:
news.spoolFile = f.split(os.sep)[-1]
if s.outputMode == 'file' and s.fileName is None and s.spoolFile == self.spoolFile:
news.fileName = os.path.join(s.spoolDir, f.split(os.sep)[-1])
elif s.outputMode == 'file' and s.fileName is None and s.spoolFile is not None:
news.fileName = os.path.join(s.spoolDir, s.spoolFile)
if s.outputMode == 'file' and s.fileName is None:
if self.fileName:
news.fileName = self.fileName
self.logger.debug("Found a global fileName {}. Setting the sample fileName.".format(self.fileName))
elif s.spoolFile == self.spoolFile:
news.fileName = os.path.join(s.spoolDir, f.split(os.sep)[-1])
elif s.spoolFile is not None:
news.fileName = os.path.join(s.spoolDir, s.spoolFile)
# Override s.name with file name. Usually they'll match unless we've been a regex
# 6/22/12 CS Save original name for later matching
news._origName = news.name
Expand Down