Skip to content

Commit

Permalink
Prevent accidental catching of exit exceptions
Browse files Browse the repository at this point in the history
Minor updates to readme
  • Loading branch information
medeor413 committed Jun 3, 2017
1 parent 76b2bc6 commit 6334335
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ staff can join the server. Look for the lines below:
},
```

And add some accounts (preferrably one per staff member) using the format below.
And add some accounts (preferably one per staff member) using the format below.
Note: you do **not** need to set "admin" to "false". Set it to "true" if you
would like this account to have administrator privileges on the underlying
Starbound dedicated server.
Expand Down Expand Up @@ -158,7 +158,7 @@ Once you have finished editing `config.json`, copy the `permissions.json.default
Starting StarryPy is as simple as issueing the command `python3 ./server.py`
once you have finised editing `config/config.json` and `config/permissions
.json`. To terminate the proxy, either press `^C` in an interactive
terminal session, or send it a `TERM` signal.
terminal session, or send it an `INT` signal.


## Contributing
Expand Down
2 changes: 1 addition & 1 deletion plugin_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def do(self, connection, action: str, packet: dict):
return send_flag
else:
return True
except:
except Exception:
self.logger.exception("Exception encountered in plugin on action: "
"%s", action, exc_info=True)
return True
Expand Down
2 changes: 1 addition & 1 deletion plugins/claims.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def _change_owner(self, data, connection):
# changing the owner of a planet they do not own.
# In that case, we need to verify this and run through the list
# of owners and remove whoever owns the target planet.
except:
except Exception:
# Better safe than sorry.
if connection.player.perm_check("planet_protect.bypass"):
for u in self.storage["owners"]:
Expand Down
2 changes: 1 addition & 1 deletion server.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def check_plugins(self, packet):
def __del__(self):
try:
self.die()
except:
except Exception:
logger.error("An error occurred while a player was disconnecting.")


Expand Down

0 comments on commit 6334335

Please sign in to comment.