Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try except loop #1292

Merged
merged 1 commit into from
Jul 22, 2016
Merged

Try except loop #1292

merged 1 commit into from
Jul 22, 2016

Conversation

msaspence
Copy link
Contributor

This pull request includes a

  • Bug fix
  • New feature
  • Translation

The following changes were made

- Wraps the search loop in a try except that will restart it if it raises an exception

There are lots of issues that this might fix (or at least work around)
#1240, #1205, #965, #1112, #1071

@msaspence msaspence force-pushed the try-except-loop branch 2 times, most recently from 03334c5 to a5beac4 Compare July 22, 2016 17:45
@jangrewe
Copy link
Contributor

Also #1323 - could you rebase this, so that it can be merged?

@msaspence
Copy link
Contributor Author

@jangrewe Done

@MonkeyLeeT MonkeyLeeT merged commit 3bafbfd into AHAAAAAAA:develop Jul 22, 2016
JohnLore pushed a commit to JohnLore/PokemonGo-Map that referenced this pull request Jul 23, 2016
@backstroke-bot @JohnLore
Update from upstream repo AHAAAAAAA/PokemonGo-Map (#2)
be02e58 
* Update README.md

* Update README.md

* Update README.md

* Update ISSUE_TEMPLATE.md

* Update README.md

* Update README.md

* direct pr to dev branch

* Update README.md

* Update PULL_REQUEST_TEMPLATE.md

* Updated templates for master

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Added japanese pokemon name. (AHAAAAAAA#1116)

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update LICENSE

* python 2.7 batch (AHAAAAAAA#1289)

* added donation address

* Added option to load settings from config.ini (AHAAAAAAA#1316)

* Create 1

* Add files via upload

* Delete credentials.example.json

* Delete 1

* Update utils.py

* Update config.ini

* Fixed Authentication typo, removed auth from auth_service

* fixed settigns issue

* Wrap the search loop in a try except that restart the loops if it crashes (AHAAAAAAA#1292)

* Handle authptc exception (AHAAAAAAA#1346)

* Update setup.bat (AHAAAAAAA#1362)

* Fixed map height issue (AHAAAAAAA#1350)

* Added npm and grunt, added node_modules/ to git ignore

* Adjusted side to the left

* Updated Grunt to minify CSS and JS, references on maps.html updated

* Added minified css and js to gitignore

* changed to having dist/ folder instead

* Fixed grunt issues, adjusted some js

* Adjusted filter styles

* UI updates, style changes

* More UI changes

* Removed overlay js as causing error

* Fixed ignore dropdown

* Fixed map height issue

* Add database filename option (AHAAAAAAA#1342)

* This allows multiple servers to run from the same working directory

* Reduce docker image size by > 50% (AHAAAAAAA#1335)

By wrapping the build tools installation and removal in the same
layer, we can prevent the download of that weight in a previous
layer.

```
before ...  242.70 MB
after  ...   94.93 MB
```

Contributing layers, and the fix:

```
$ docker history before
IMAGE               CREATED             CREATED BY                                      SIZE
49fc4fec61cf        4 minutes ago       /bin/sh -c #(nop) COPY dir:a35abf98d7e251057f   2.808 MB
af74caea7748        4 minutes ago       /bin/sh -c pip install --no-cache-dir -r requ   34.93 MB
698d746acb8c        6 minutes ago       /bin/sh -c #(nop) COPY file:e9ce3df02e968ddde   257 B
e1f6a843f2f2        6 minutes ago       /bin/sh -c apk add --no-cache     build-base    148.5 MB
<missing>           2 days ago          /bin/sh -c set -ex  && apk add --no-cache --v   51.65 MB
<missing>           4 weeks ago         /bin/sh -c #(nop) ADD file:852e9d0cb9d906535a   4.799 MB

$ docker history after
IMAGE               CREATED              CREATED BY                                      SIZE
92939ad7153c        About a minute ago   /bin/sh -c #(nop) COPY dir:d14755e414af926414   2.808 MB
334b7b6d7852        About a minute ago   /bin/sh -c apk add --no-cache build-base  &&    34.93 MB
2ea7e1be38b9        3 minutes ago        /bin/sh -c #(nop) COPY file:e9ce3df02e968ddde   257 B
d629c2deeedf        3 minutes ago        /bin/sh -c apk add --no-cache ca-certificates   746.4 kB
<missing>           2 days ago           /bin/sh -c set -ex  && apk add --no-cache --v   51.65 MB
<missing>           4 weeks ago          /bin/sh -c #(nop) ADD file:852e9d0cb9d906535a   4.799 MB
```

(Removed some 0byte lines from the history output for clarity)

* Change search pattern to use a hex grid (AHAAAAAAA#1338)

* Change search to use a hex grid

* Add import math

* Add Scanned Area markers onto the map (AHAAAAAAA#1102)

* Add ability to show scanned area's on the map

* Only send scans from the last 15 minutes to the map

* Hide Scanned Location Info Window

* Fix broken parse_map arguments from rebase

* Fix broken parse_map arguments from rebase

* Fix flashing circles bug and remove circles after 15 mins

* Side bar functionality fixed (AHAAAAAAA#1391)

* Fixed searchbar and re-added, sorted styles out for sidebar

* Fix Percentage display (AHAAAAAAA#1374)

* SSL Support (AHAAAAAAA#1387)

* Updated runserver.py to support SSL

* Updated credentials.json for support SSL

* Revert "SSL Support" (AHAAAAAAA#1412)

* Multithread search (AHAAAAAAA#1395)

* Multithread search

* remove unnecessary print()

* Default threads to 5

* Use localstorage for exclude/notify pokemon lists (AHAAAAAAA#1390)

In #1192 a user is having trouble keeping these lists, but the localstorage options do work. Since theres no real reason to have these as cookies, I've converted the lists over to localstorage instead.

* Fixed auth loop (#1025) (AHAAAAAAA#1367)

* Fixed auth loop (#1025)

* Forgot to change one line to elif

* Update map.html

* cleared master

* Update map.js

* Update map.js

* Added back China coords transformation, (AHAAAAAAA#1423) (AHAAAAAAA#1424)

which was deleted in some PR.

* Change default display to no pokestops, no scan bubbles (AHAAAAAAA#1425)

* Added new video guide to readme

* Fixed China coords transformation for pokemon. (AHAAAAAAA#1444)

* Added back China coords transformation,

which was deleted in some PR.

* Fixed China coords transformation for pokemon.

* latest dev into master (AHAAAAAAA#1468)

* Added back China coords transformation, (AHAAAAAAA#1423)

which was deleted in some PR.

* updated dev build (AHAAAAAAA#1440)

* Update README.md

* Update README.md

* Update README.md

* Update ISSUE_TEMPLATE.md

* Update README.md

* Update README.md

* direct pr to dev branch

* Update README.md

* Update PULL_REQUEST_TEMPLATE.md

* Updated templates for master

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Added japanese pokemon name. (AHAAAAAAA#1116)

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update LICENSE

* python 2.7 batch (AHAAAAAAA#1289)

* added donation address

* cleared master

* Update map.js

* Update map.js

* Added back China coords transformation, (AHAAAAAAA#1423) (AHAAAAAAA#1424)

which was deleted in some PR.

* Change default display to no pokestops, no scan bubbles (AHAAAAAAA#1425)

* Added new video guide to readme

* Option to notify with sound (AHAAAAAAA#1465)

* Config files: add/update paths in gitignore (AHAAAAAAA#1352)

updating the config files for upstream can be
  done with `git add -f/--force config/$filename`.

* Don't hardcode URL root in JS (AHAAAAAAA#1442)

* Load configuration from config.ini file without required arguments -u/-l/-st (AHAAAAAAA#1453)

* Load configuration from config.ini without passing -u -l -st arguments

* Check required arguments if settings is not defined

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Support Japanese name (AHAAAAAAA#1545)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@msaspence @jangrewe @MonkeyLeeT