jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2017-03-15 14:55:11 +08:00
parent 0ed7f92cc5 3b4b069348
commit fcae5e9690
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/avatar_controller.rb
View File

@ -75,10 +75,12 @@ class AvatarController < ApplicationController
end
@temp_file = nil
while !File.exists?(diskfile)
logger.info("###############################################################sleep")
sleep(0.5)
end
# while !File.readable?(diskfile)
# logger.info("###############################################################sleep")
# sleep(0.5)
# end
#@src_file = diskfile
respond_to do |format|
format.json{