Skip to content

Commit d8f20e3

Browse files
committed
Change console message indicating server address and port to reflect DRO no longer using the old syntax
1 parent e630ac5 commit d8f20e3

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,5 +814,6 @@
814814
* Added support for changing backgrounds in an area associated with periods via commands
815815
- /bg_period
816816
- /bg_period_end
817+
* Changed console message indicating server address and port to reflect DRO no longer using the old syntax
817818
* Fixed /lasterror providing duplicate error information
818819
* Fixed /clock_period erroring out if a non-numerical invalid hour start or hour length was given.

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ It is highly recommended you read through all the installation steps first befor
5252
* If everything was set up correctly, you will see something like this appear:
5353

5454
```
55-
[2022-08-21T10:20:20]: Starting...
56-
[2022-08-21T10:20:20]: Launching TsuserverDR 4.3.4 (220821a)...
57-
[2022-08-21T10:20:20]: Loading server configurations...
58-
[2022-08-21T10:20:20]: Server configurations loaded successfully!
59-
[2022-08-21T10:20:20]: Starting a nonlocal server...
60-
[2022-08-21T10:20:20]: Server started successfully!
61-
[2022-08-21T10:20:21]: Server should be now accessible from 192.0.2.0:50000:My First DR Server
55+
[2022-09-12T10:20:20]: Starting...
56+
[2022-09-12T10:20:20]: Launching TsuserverDR 4.3.5 (220912a)...
57+
[2022-09-12T10:20:20]: Loading server configurations...
58+
[2022-09-12T10:20:20]: Server configurations loaded successfully!
59+
[2022-09-12T10:20:20]: Starting a nonlocal server...
60+
[2022-09-12T10:20:20]: Server started successfully!
61+
[2022-09-12T10:20:21]: Server should be now accessible from address 192.0.2.0 and port 50000.
6262
```
6363

6464
* If you are listing your server in the Attorney Online master server, make sure its details are set up correctly. In particular, make sure that your server name and description are correct, as that is how players will find your server. If everything was set up correctly, you will see something like this appear:
6565

6666
```
67-
[2022-08-21T10:20:21]: Attempting to connect to the master server at https://servers.aceattorneyonline.com/servers with the following details:
68-
[2022-08-21T10:20:21]: *Server name: My First DR Server
69-
[2022-08-21T10:20:21]: *Server description: This is my flashy new DR server
70-
[2022-08-21T10:20:22]: Connected to the master server.
67+
[2022-09-12T10:20:21]: Attempting to connect to the master server at https://servers.aceattorneyonline.com/servers with the following details:
68+
[2022-09-12T10:20:21]: *Server name: My First DR Server
69+
[2022-09-12T10:20:21]: *Server description: This is my flashy new DR server
70+
[2022-09-12T10:20:22]: Connected to the master server.
7171
```
7272

7373
- The server will make a single ping to [ipify](https://api.ipify.org) in order to obtain its public IP address. If it fails to do that, it will let you know that, as it means there is probably something wrong with your internet connection and that other players may not be able to connect to your server.
@@ -76,9 +76,9 @@ It is highly recommended you read through all the installation steps first befor
7676
* To stop the server, press Ctrl+C once from your terminal. This will initiate a shutdown sequence and notify you when it is done. If the shutdown finished successfully, you will see something like this appear:
7777

7878
```
79-
[2022-08-21T22:23:04]: You have initiated a server shut down.
80-
[2022-08-21T22:23:04]: Kicking 12 remaining clients.
81-
[2022-08-21T22:23:04]: Server has successfully shut down.
79+
[2022-09-12T22:23:04]: You have initiated a server shut down.
80+
[2022-09-12T22:23:04]: Kicking 12 remaining clients.
81+
[2022-09-12T22:23:04]: Server has successfully shut down.
8282
```
8383

8484
* If you do not see anything after a few seconds of starting a shutdown, you can try spamming Ctrl+C to try and force a shutdown or directly close out your terminal. This is not recommended due to the cleanup process not finishing correctly but it is doable.

server/tsuserver.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ def __init__(self, protocol: AOProtocol = None,
6868
self.release = 4
6969
self.major_version = 3
7070
self.minor_version = 5
71-
self.segment_version = 'RC1'
72-
self.internal_version = 'm220912a'
71+
self.segment_version = 'RC2'
72+
self.internal_version = 'm220912b'
7373
version_string = self.get_version_string()
7474
self.software = 'TsuserverDR {}'.format(version_string)
7575
self.version = 'TsuserverDR {} ({})'.format(version_string, self.internal_version)
@@ -213,12 +213,12 @@ async def start(self):
213213
'Players may be unable to join.'
214214
.format(type(ex).__name__, ex.reason))
215215
if host_ip is not None:
216-
logger.log_pdebug('Server should be now accessible from {}:{}:{}'
217-
.format(host_ip, self.config['port'], server_name))
216+
logger.log_pdebug(f'Server should be now accessible from address {host_ip} and port '
217+
f'{self.config["port"]}.')
218218
if not self.config['local']:
219-
logger.log_pdebug('If you want to join your server from this device, you may need to '
220-
'join with this IP instead: 127.0.0.1:{}:localhost'
221-
.format(self.config['port']))
219+
logger.log_pdebug(f'If you want to join your server from this device, you may need to '
220+
f'join instead from address 127.0.0.1 and port '
221+
f'{self.config["port"]}.')
222222

223223
if self.config['local']:
224224
self.local_connection = asyncio.create_task(self.tasker.do_nothing())

0 commit comments

Comments
 (0)