Skip to content

Commit 8f746bc

Browse files
authored
Merge pull request #9 from randlabs/improved_git_stuff_plus_syslog_fix
SysLog options fix + git files
2 parents 9748d91 + 4b3d3e1 commit 8f746bc

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

.gitattributes

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Handle line endings automatically for files detected as text
2+
# and leave all files detected as binary untouched.
3+
* text=auto
4+
5+
# Force the following filetypes to have unix eols, so Windows does not break them
6+
*.* text eol=lf
7+
8+
# Windows forced line-endings
9+
/.idea/* text eol=crlf
10+
11+
#
12+
## These files are binary and should be left untouched
13+
#
14+
15+
# (binary is a macro for -text -diff)
16+
*.png binary
17+
*.jpg binary
18+
*.jpeg binary
19+
*.gif binary
20+
*.ico binary
21+
*.mov binary
22+
*.mp4 binary
23+
*.mp3 binary
24+
*.flv binary
25+
*.fla binary
26+
*.swf binary
27+
*.gz binary
28+
*.zip binary
29+
*.7z binary
30+
*.ttf binary
31+
*.eot binary
32+
*.woff binary
33+
*.pyc binary
34+
*.pdf binary
35+
*.ez binary
36+
*.bz2 binary
37+
*.swp binary

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
21
*.~*
32

43
*.log
54
*.swp
65
.idea
6+
.vscode
77
*.patch
88
### Go template
99
# Binaries for programs and plugins

syslog_logger/syslog_logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func CreateSysLogLogger(appName string, options *SysLogOptions) (*SysLogLogger,
6666
syslogLogger.host = "127.0.0.1"
6767
}
6868

69-
if options.Port == 0 {
69+
if options.Port != 0 {
7070
syslogLogger.port = options.Port
7171
} else {
7272
if options.UseTcp {

0 commit comments

Comments
 (0)