Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-12 15:13:40 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-12 15:13:40 +0300
commit6afb9dd3775d7b16110a320c4e1968934ab430d7 (patch)
tree04e5fa6295b09a2181f3042a7c8108b92b41abf1
parent9042f5171c4bddc3da330b0e236e5faa78e657c3 (diff)
Move helpers
-rw-r--r--helpers.go30
-rw-r--r--helpers_test.go (renamed from helper_test.go)0
-rw-r--r--main.go25
3 files changed, 30 insertions, 25 deletions
diff --git a/helpers.go b/helpers.go
new file mode 100644
index 00000000..cd989b97
--- /dev/null
+++ b/helpers.go
@@ -0,0 +1,30 @@
+package main
+
+import (
+ "io/ioutil"
+ "log"
+ "net"
+)
+
+func readFile(file string) (result []byte) {
+ result, err := ioutil.ReadFile(file)
+ if err != nil {
+ log.Fatalln(err)
+ }
+ return
+}
+
+func createSocket(addr string) (l net.Listener, fd uintptr) {
+ l, err := net.Listen("tcp", addr)
+ if err != nil {
+ log.Fatalln(err)
+ }
+
+ f, err := l.(*net.TCPListener).File()
+ if err != nil {
+ log.Fatalln(err)
+ }
+
+ fd = f.Fd()
+ return
+}
diff --git a/helper_test.go b/helpers_test.go
index 5d564891..5d564891 100644
--- a/helper_test.go
+++ b/helpers_test.go
diff --git a/main.go b/main.go
index 8f439b51..5b7dd3f9 100644
--- a/main.go
+++ b/main.go
@@ -3,11 +3,9 @@ package main
import (
"flag"
"fmt"
- "io/ioutil"
"log"
"net"
"os"
- "path/filepath"
"strings"
)
@@ -17,29 +15,6 @@ var VERSION = "dev"
// REVISION stores the information about the git revision of application
var REVISION = "HEAD"
-func readFile(file string) (result []byte) {
- result, err := ioutil.ReadFile(file)
- if err != nil {
- log.Fatalln(err)
- }
- return
-}
-
-func createSocket(addr string) (l net.Listener, fd uintptr) {
- l, err := net.Listen("tcp", addr)
- if err != nil {
- log.Fatalln(err)
- }
-
- f, err := l.(*net.TCPListener).File()
- if err != nil {
- log.Fatalln(err)
- }
-
- fd = f.Fd()
- return
-}
-
func main() {
var listenHTTP = flag.String("listen-http", ":80", "The address to listen for HTTP requests")
var listenHTTPS = flag.String("listen-https", "", "The address to listen for HTTPS requests")