Skip to content

Commit

Permalink
before switching to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Hooram Nam committed Jun 12, 2018
1 parent 39d0e2c commit 7e56c87
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ EXPOSE 5000

COPY . /code

RUN mkdir /code/logs

RUN mv /code/config_docker.py /code/config.py

Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ though, make sure http requests get redirected to https. It's important!
server {
# the port your site will be served on
listen 80;
server_name ownphotos-api.example.com; # substitute by your FQDN and
machine's IP address
server_name ownphotos-api.example.com;
charset utf-8;
#Max upload size
Expand All @@ -167,14 +166,12 @@ machine's IP address
server {
# the port your site will be served on
listen 80;
server_name ownphotos.example.com; # substitute by your FQDN and
machine's IP address
server_name ownphotos.example.com;
charset utf-8;
#Max upload size
client_max_body_size 75M; # adjust to taste
location / {
proxy_pass http://127.0.0.1:8001;
proxy_set_header Host $host;
Expand Down
9 changes: 7 additions & 2 deletions scripts/client_bench.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
auth = HTTPBasicAuth('admin','q1W@e3R$')

start = datetime.datetime.now()

'''
resp_location_sunburst = requests.get('http://localhost:8000/api/locationsunburst/',auth=auth)
print('location_sunburst: \t| %.2f ms'%(resp_location_sunburst.elapsed.total_seconds()*1000))
Expand Down Expand Up @@ -38,11 +38,16 @@
# resp_photos = requests.get('http://192.168.1.100:8000/api/photos/list/',auth=auth)
# print(resp_photos.elapsed.total_seconds()*1000)
# resp_photos_json = resp_photos.json()

'''

resp_album_date = requests.get('http://localhost:8000/api/albums/date/photohash/list/',auth=auth)
print('album_date_list: \t| %.2f ms'%(resp_album_date.elapsed.total_seconds()*1000))

resp_photo_list = requests.get('http://localhost:8000/api/photos/list/',auth=auth)
print('photo_list: \t| %.2f ms'%(resp_photo_list.elapsed.total_seconds()*1000))

resp_fav_photo_list = requests.get('http://localhost:8000/api/photos/favorites/',auth=auth)
print('fav_photo_list: \t| %.2f ms'%(resp_fav_photo_list.elapsed.total_seconds()*1000))


# resp_album_auto = requests.get('http://localhost:8000/api/albums/auto/list/',auth=auth).json()
Expand Down

0 comments on commit 7e56c87

Please sign in to comment.