mirrors/imgsrv
1
0
Fork 0
mirror of https://github.com/vbatts/imgsrv.git synced 2024-12-26 15:56:31 +00:00
Code Releases Activity

Revert "my rand helper wasn't helping"

Browse source 
This reverts commit 84e5af9fc2.
This commit is contained in:
Vincent Batts 2013-02-13 22:30:04 -05:00
parent 84e5af9fc2
commit 51ff306fd9
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
db_fileutil.go
View file

@ -3,7 +3,6 @@ package main
import ( import (
"labix.org/v2/mgo/bson" "labix.org/v2/mgo/bson"
"math/rand"
) )
/* gfs is a *mgo.GridFS defined in imgsrv.go */ /* gfs is a *mgo.GridFS defined in imgsrv.go */
@ -17,7 +16,7 @@ func GetFileByFilename(filename string) (this_file File, err error) {
} }
func GetFileRandom() (this_file File, err error) { func GetFileRandom() (this_file File, err error) {
r := rand.Int63() r := Rand64()
err = gfs.Find(bson.M{"random": bson.M{"$gt" : r } }).One(&this_file) err = gfs.Find(bson.M{"random": bson.M{"$gt" : r } }).One(&this_file)
if (err != nil) { if (err != nil) {
return this_file, err return this_file, err

5
hash.go
View file

@ -1,6 +1,7 @@
package main package main
import ( import (
"math/rand"
"crypto/md5" "crypto/md5"
"fmt" "fmt"
"hash/adler32" "hash/adler32"
@ -8,6 +9,10 @@ import (
"time" "time"
) )
func Rand64() int64 {
return rand.Int63()
}
/* Convinience method for getting md5 sum of a string */ /* Convinience method for getting md5 sum of a string */
func GetMd5FromString(blob string) (sum []byte) { func GetMd5FromString(blob string) (sum []byte) {
h := md5.New() h := md5.New()

7
server.go
View file

@ -6,7 +6,6 @@ import (
"labix.org/v2/mgo" "labix.org/v2/mgo"
"labix.org/v2/mgo/bson" "labix.org/v2/mgo/bson"
"log" "log"
"math/rand"
"mime" "mime"
"net/http" "net/http"
"os" "os"
@ -143,7 +142,7 @@ func routeFilesPOST(w http.ResponseWriter, r *http.Request) {
var filename string var filename string
info := Info{ info := Info{
Ip: r.RemoteAddr, Ip: r.RemoteAddr,
Random: rand.Int63(), Random: Rand64(),
TimeStamp: time.Now(), TimeStamp: time.Now(),
} }
@ -434,7 +433,7 @@ func routeGetFromUrl(w http.ResponseWriter, r *http.Request) {
if (r.Method == "POST") { if (r.Method == "POST") {
info := Info{ info := Info{
Ip: r.RemoteAddr, Ip: r.RemoteAddr,
Random: rand.Int63(), Random: Rand64(),
TimeStamp: time.Now(), TimeStamp: time.Now(),
} }
log.Println(info) log.Println(info)
@ -513,7 +512,7 @@ func routeUpload(w http.ResponseWriter, r *http.Request) {
if (r.Method == "POST") { if (r.Method == "POST") {
info := Info{ info := Info{
Ip: r.RemoteAddr, Ip: r.RemoteAddr,
Random: rand.Int63(), Random: Rand64(),
TimeStamp: time.Now(), TimeStamp: time.Now(),
} }