Move code inside the success promise for online status
This commit is contained in:
		
							parent
							
								
									d59b7f03d5
								
							
						
					
					
						commit
						3a6a190404
					
				
							
								
								
									
										28
									
								
								index.js
									
									
									
									
									
								
							
							
						
						
									
										28
									
								
								index.js
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -41,27 +41,16 @@ function getOnlineReport(channel = null) {
 | 
			
		|||
    });
 | 
			
		||||
    Servers.forEach(function (server) {
 | 
			
		||||
        if ( !online[server.slug] ) return;
 | 
			
		||||
        const q = new Query({host: server.rconAddress, port: server.queryPort, timeout: 250});
 | 
			
		||||
        const q = new Query({host: server.rconAddress, port: server.queryPort, timeout: 7250});
 | 
			
		||||
        try {
 | 
			
		||||
            q.fullStat()
 | 
			
		||||
                .then(response => {
 | 
			
		||||
                    online[server.slug].tested = true;
 | 
			
		||||
                    online[server.slug].online = true;
 | 
			
		||||
                    online[server.slug].players = response.players;
 | 
			
		||||
                    //sendOnline(online, channel);
 | 
			
		||||
                })
 | 
			
		||||
                .then(() => { q.close(); })
 | 
			
		||||
                .catch(e => {
 | 
			
		||||
                .then(success => {
 | 
			
		||||
                    q.close();
 | 
			
		||||
                    //console.log("slug: " + server.slug);
 | 
			
		||||
                    //console.log(online);
 | 
			
		||||
                    online[server.slug].tested = true;
 | 
			
		||||
                    //sendOnline(online, channel);
 | 
			
		||||
                });
 | 
			
		||||
        } catch (e) {
 | 
			
		||||
            console.log(e);
 | 
			
		||||
        }
 | 
			
		||||
    });
 | 
			
		||||
                    let playerCount = 0;
 | 
			
		||||
                    let embed = new EmbedBuilder()
 | 
			
		||||
                        .setColor(0x44ff44)
 | 
			
		||||
| 
						 | 
				
			
			@ -80,6 +69,17 @@ function getOnlineReport(channel = null) {
 | 
			
		|||
                    if ( Config.PRESENCE_INTERVAL != 0 ) {
 | 
			
		||||
                        client.user.setPresence({ activities: [{ name: "Online: " + playerCount }], status: 'online' });
 | 
			
		||||
                    }
 | 
			
		||||
                })
 | 
			
		||||
                .catch(e => {
 | 
			
		||||
                    q.close();
 | 
			
		||||
                    //console.log("slug: " + server.slug);
 | 
			
		||||
                    //console.log(online);
 | 
			
		||||
                    online[server.slug].tested = true;
 | 
			
		||||
                });
 | 
			
		||||
        } catch (e) {
 | 
			
		||||
            console.log(e);
 | 
			
		||||
        }
 | 
			
		||||
    });
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
client.on('messageCreate', (msg) => {
 | 
			
		||||
| 
						 | 
				
			
			@ -200,4 +200,4 @@ client.on('messageCreate', (msg) => {
 | 
			
		|||
 | 
			
		||||
client.login(Config.BOT_TOKEN);
 | 
			
		||||
 | 
			
		||||
// vim: set ts=4 sw=4:
 | 
			
		||||
// vim: set et ts=4 sw=4:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user