Skip to content

Commit ffd87d0

Browse files
author
karel26
committed
CHANGES:
- Renamed OvGME => ModManager! - Renamed Services/Scheduler to Services/Cron!
1 parent 98e9b2c commit ffd87d0

File tree

40 files changed

+196
-127
lines changed

40 files changed

+196
-127
lines changed

ARCHITECTURE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Node
4141
|_ DashBoard
4242
|_ Monitoring
4343
|_ Backup (optional)
44-
|_ OvGME (optional)
44+
|_ ModManager (optional)
4545
|_ Music (optional)
4646
|_ Extensions (all optional)
4747
|_ DCS-SRS

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ Discord commands, like the Music service. Some services only run on the master n
3838
|------------|-----------------------------------------------------------------------------------------------------------|-------------|-------------------------------------------|
3939
| Backup | Backup your bot- and DCS-configuration, your missions, database, etc. | Backup | [README](./services/backup/README.md) |
4040
| Bot | The Discord bot handling all discord commands. There is a Discord-free variant available also (see blow)! | | [README](./services/bot/README.md) |
41-
| Cleanup | Cleanup logfiles, trackfiles, etc. from your disk. | | [README](./services/cleanup/README.md) |
41+
| Cleanup | Cleanup log-files, track-files, etc. from your disk. | | [README](./services/cleanup/README.md) |
4242
| Dashboard | Nice console graphics display to show the status of your bot / servers. | | [README](./services/dashboard/README.md) |
4343
| Monitoring | Availability- and performance-monitoring of your DCS servers. | ServerStats | [README](./services/monitoring/README.md) |
4444
| Music | Play music over different SRS-radios on your servers. | Music | [README](./services/music/README.md) |
45-
| OvGME | Manage mods that needs to be installed / updated in your DCS servers. | OvGME | [README](./services/ovgme/README.md) |
46-
| Scheduler | Schedule tasks based on a cron-like configuration. | Scheduler | [README](./services/scheduler/README.md) |
45+
| ModManager | Manage mods that needs to be installed / updated in your DCS servers. | ModManager | [README](./services/modmanager/README.md) |
46+
| Cron | Schedule tasks based on a cron-like configuration. | | [README](./services/cron/README.md) |
4747
| ServiceBus | Communication hub between every node of the bot cluster and all DCS-servers. | | [README](./services/servicebus/README.md) |
4848

4949
### Plugins
@@ -72,7 +72,7 @@ from time to time, but you as a community member can also create your own plugin
7272
| LotAtc | Upload LotAtc Transponder files to your servers. | yes | | [README](./plugins/lotatc/README.md) |
7373
| MOTD | Message for players on join or when they jump in a module. | yes | Mission, MissionStats | [README](./plugins/motd/README.md) |
7474
| Music | Upload and play music over SRS. | yes | | [README](./plugins/music/README.md) |
75-
| OvGME | Install or update mods into your DCS server. | yes | | [README](./plugins/ovgme/README.md) |
75+
| ModManager | Install or update mods into your DCS server. | yes | | [README](./plugins/modmanager/README.md) |
7676
| Pretense | Commands for Pretense missions. | yes | | [README](./plugins/pretense/README.md) |
7777
| Punishment | Punish users for team-hits or team-kills. | yes | Mission | [README](./plugins/punishment/README.md) |
7878
| RealWeather | Apply real weather to your missions (also available as an extension). | yes | | [README](./plugins/realweather/README.md) |
@@ -107,7 +107,7 @@ DCSServerBot supports some of them already and can add a bit of quality of life.
107107
| LotAtc | GCI- and ATC-extension for DCS World. Simple display only extension. | [README](./extensions/lotatc/README.md) |
108108
| MizEdit | My own invention, can be used to modify your missions. Very powerful! | [README](./extensions/mizedit/README.md) |
109109
| Olympus | Real-time control of your DCS missions through a map interface. | [README](./extensions/olympus/README.md) |
110-
| OvGME | Use mods within your DCS World servers. | [README](./extensions/ovgme/README.md) |
110+
| ModManager | Use mods within your DCS World servers. | [README](./extensions/modmanager/README.md) |
111111
| Pretense | Dynamic campaign framework by Dzsek. | [README](./extensions/pretense/README.md) |
112112
| RealWeather | Real weather for your missions using DCS Real Weather. | [README](./extensions/realweather/README.md) |
113113
| Sneaker | Moving map interface (see [Battleground](https://github.com/Frigondin/DCSBattleground) for another option! | [README](./extensions/sneaker/README.md) |
@@ -306,7 +306,7 @@ opt_plugins: # Optional: list of optional plugins to be
306306
- slotblocking
307307
- music
308308
- funkman
309-
- ovgme
309+
- modmanager
310310
- commands
311311
- restapi
312312
```

core/data/impl/nodeimpl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,12 @@ async def init_db(self) -> tuple[ConnectionPool, AsyncConnectionPool]:
276276
return db_pool, db_apool
277277

278278
async def close_db(self):
279-
if not self.pool.closed:
279+
if self.pool and not self.pool.closed:
280280
try:
281281
self.pool.close()
282282
except Exception as ex:
283283
self.log.exception(ex)
284-
if not self.apool.closed:
284+
if self.apool and not self.apool.closed:
285285
try:
286286
await self.apool.close()
287287
except Exception as ex:

docs/commands/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ These commands can be used to administrate the bot itself.
104104
| .modulestats / .modstats | [@member / Player Name] [period] | all | DCS | Display module and weapon statistics per module. |
105105
| .refuelings / .refuel | [@member / Player Name] [period] | all | DCS | Display refuelings per module. |
106106

107-
## Plugin OvGME
107+
## Plugin ModManager
108108

109109
| Command | Parameter | Channel | Role | Description |
110110
|-----------------|--------------------------|---------------|------------------|---------------------------------------------------------------------------------|
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Extension "OvGME"
1+
# Extension "ModManager"
22
This little extension checks, if you have any requiredModules in your miz file and shows them in the server status
33
embed in Discord. Nice addition for your users, if you show them what to install to fly on your server.
44

@@ -11,6 +11,6 @@ MyNode:
1111
DCS.release_server:
1212
# [...]
1313
extensions:
14-
OvGME:
14+
ModManager:
1515
enabled: true
1616
```
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from typing import Optional
55

66
__all__ = [
7-
"OvGME"
7+
"ModManager"
88
]
99

1010

11-
class OvGME(Extension):
11+
class ModManager(Extension):
1212
def __init__(self, server: Server, config: dict):
1313
super().__init__(server, config)
1414
self.modules: dict[str, list[str]] = {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
schema;instance_ovgme_schema:
1+
schema;modmanager_schema:
22
type: map
33
mapping:
44
enabled: {type: bool}

extensions/schemas/extensions_schema.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ schema;instance_extensions_schema:
3636
include: 'mizedit_schema'
3737
Olympus:
3838
include: 'instance_olympus_schema'
39-
OvGME:
40-
include: 'instance_ovgme_schema'
39+
ModManager:
40+
include: 'modmanager_schema'
4141
Pretense:
4242
include: 'pretense_schema'
4343
RealWeather:
439 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)