mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
refactor: change deprecated "io/ioutil" package to recommended "io" package
This commit is contained in:
parent
35984c0876
commit
acce1f1fd9
14 changed files with 25 additions and 39 deletions
|
@ -5,7 +5,6 @@ import (
|
|||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
|
@ -198,7 +197,7 @@ func main() {
|
|||
// buffer is full.
|
||||
// https://bugs.torproject.org/26360
|
||||
// https://bugs.torproject.org/25600#comment:14
|
||||
var logOutput = ioutil.Discard
|
||||
var logOutput = io.Discard
|
||||
if *logFilename != "" {
|
||||
if *logToStateDir || *oldLogToStateDir {
|
||||
stateDir, err := pt.MakeStateDir()
|
||||
|
@ -298,8 +297,8 @@ func main() {
|
|||
// This environment variable means we should treat EOF on stdin
|
||||
// just like SIGTERM: https://bugs.torproject.org/15435.
|
||||
go func() {
|
||||
if _, err := io.Copy(ioutil.Discard, os.Stdin); err != nil {
|
||||
log.Printf("calling io.Copy(ioutil.Discard, os.Stdin) returned error: %v", err)
|
||||
if _, err := io.Copy(io.Discard, os.Stdin); err != nil {
|
||||
log.Printf("calling io.Copy(io.Discard, os.Stdin) returned error: %v", err)
|
||||
}
|
||||
log.Printf("synthesizing SIGTERM because of stdin close")
|
||||
sigChan <- syscall.SIGTERM
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue