Skip to content

support znc default log file #6

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
khiro merged 1 commit into from
Sep 12, 2014
Merged

support znc default log file #6

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,13 @@ func readLogFile(filename string) chan string {
func collectLogs(filepattern string, searchword string) []string {
logfiles, _ := filepath.Glob(filepattern)
var logs = []string{}
var day = ""
for _, filename := range logfiles {
var day = strings.Split(path.Base(filename), "_")[1][0:8]
if len(strings.Split(path.Base(filename), "_")) == 3 {
day = strings.Split(path.Base(filename), "_")[2][0:8]
} else {
day = strings.Split(path.Base(filename), "_")[1][0:8]
}
for line := range readLogFile(filename) {
if line == "" {
break
Expand Down
9 changes: 7 additions & 2 deletions search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ func checkSearchresponse(t *testing.T, url string, testFile string) {
t.Error("Search results error")
}

if strings.Contains(string(body), "general") == true {
t.Error("Search results format error")
}

err = os.Remove(testFile)
if err != nil {
t.Error("Test file remove error", err)
Expand All @@ -62,6 +66,7 @@ func TestServer(t *testing.T) {

check200Status(t, server.URL)
check200Status(t, server.URL+"/bbsearch")
checkSearchresponse(t, server.URL+"/bbsearch?q=test", "bb_00000000.txt")
checkSearchresponse(t, server.URL+"/bbsearch?q=test", "general_00000000.txt")
checkSearchresponse(t, server.URL+"/bbsearch?q=test", "#bb_00000000.txt")
checkSearchresponse(t, server.URL+"/bbsearch?q=test", "#general_00000000.txt")
checkSearchresponse(t, server.URL+"/bbsearch?q=test", "default_#general_00000000.txt")
}