Skip to content

Commit 5dc38e3

Browse files
committed
less panic
1 parent 1d7f82f commit 5dc38e3

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.6
1+
1.1.7

main.go

+21-22
Original file line numberDiff line numberDiff line change
@@ -211,26 +211,23 @@ func (c *Client) ProcessOutput() {
211211
panic(err)
212212
}
213213

214-
lineNum := 0
215214
scan := bufio.NewScanner(f)
216215

217216
for scan.Scan() {
218217
line := scan.Text()
219-
if strings.Contains(line, "NXDOMAIN") {
220-
lineNum = 0
218+
if strings.Contains(strings.ToLower(line), "nxdomain") {
219+
continue
221220
}
222221

223-
if lineNum > 0 && lineNum <= AnswerLineNum {
224-
if strings.Contains(line, "NOERROR") {
225-
domain := ProcessRecord(line)
226-
_, err = w.WriteString(domain + "\n")
222+
if !strings.Contains(strings.ToLower(line), "noerror") {
223+
continue
224+
}
227225

228-
if err != nil {
229-
panic(err)
230-
}
231-
}
226+
domain := ProcessRecord(line)
227+
_, err = w.WriteString(domain + "\n")
228+
if err != nil {
229+
panic(err)
232230
}
233-
lineNum++
234231
}
235232

236233
_ = w.Flush()
@@ -270,15 +267,17 @@ func (c *Client) Run() {
270267
c.RunMassDNS()
271268
c.ProcessOutput()
272269
//
273-
xz := exec.Command("/usr/bin/xz", "/tmp/results.txt")
274-
err := xz.Start()
275-
if err != nil {
276-
log.Fatal(err.Error())
277-
}
278-
err = xz.Wait()
279-
if err != nil {
280-
log.Fatal(err.Error())
281-
}
270+
xz := exec.Command("/usr/bin/xz", "/tmp/results.txt")
271+
err := xz.Start()
272+
if err != nil {
273+
log.Error(err.Error())
274+
continue
275+
}
276+
err = xz.Wait()
277+
if err != nil {
278+
log.Error(err.Error())
279+
continue
280+
}
282281

283282
err = c.Upload("https://api.domainsproject.org/api/vo/upload", "/tmp/results.txt.xz")
284283
if err != nil {
@@ -288,7 +287,7 @@ func (c *Client) Run() {
288287
// clean up
289288
os.Remove("/tmp/input.txt")
290289
os.Remove("/tmp/output.txt")
291-
os.Remove("/tmp/results.txt")
290+
os.Remove("/tmp/results.txt.xz")
292291
}
293292
}
294293

0 commit comments

Comments
 (0)