yakumo.izuru/tokiko
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log non-fatal errors as non-fatal

Browse Source 
git-svn-id: file:///srv/svn/repo/tokiko/trunk@6 8f5ca974-a7f8-e144-9f80-d41d5039c194
This commit is contained in:
shokara 2021-12-23 19:15:09 +00:00
parent c50496b07b
commit 4feb13d288
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main.go
View File

@ -37,11 +37,12 @@ func writeError(c net.Conn, msg string) {
func printGophermap(c net.Conn, dir string) {
file, err := os.Open(dir + "/Gophermap")
if err != nil {
log.Fatal(err)
writeError(c, err.Error())
log.Println(err)
}
defer func() {
if err = file.Close(); err != nil {
log.Fatal(err)
log.Println(err)
}
}()
@ -56,11 +57,12 @@ func printGophermap(c net.Conn, dir string) {
func printFile(c net.Conn, path string) {
file, err := os.Open(path)
if err != nil {
log.Fatal(err)
writeError(c, err.Error())
log.Println(err)
}
defer func() {
if err = file.Close(); err != nil {
log.Fatal(err)
log.Println(err)
}
}()
@ -72,7 +74,7 @@ func printFile(c net.Conn, path string) {
readSz, err := file.Read(b)
if err != nil {
if err != io.EOF {
log.Fatal(err)
log.Println(err)
}
break
}
@ -84,7 +86,7 @@ func printFile(c net.Conn, path string) {
func connHandle(c net.Conn) {
data, err := bufio.NewReader(c).ReadString('\n')
if err != nil {
log.Fatal(err)
log.Println(err)
return
}
@ -97,7 +99,11 @@ func connHandle(c net.Conn) {
} else if selector[0] == '/' {
info, err := os.Stat(selector[1:])
if err != nil {
log.Fatal(err)
writeError(c, err.Error())
log.Println(err)
c.Close()
return
}
if info.IsDir() {
@ -128,7 +134,7 @@ func main() {
for {
c, err := l.Accept()
if err != nil {
log.Fatal(err)
log.Println(err)
return
}