Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-13 06:42:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR log spam cleanup

Browse source
This commit is contained in:
Atlante45 2017-02-02 15:08:34 -08:00
parent 6fbe3c9187
commit 72ed1add94
7 changed files with 47 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClientLogging.cpp
View file

@ -3,7 +3,7 @@
// assignment-client/src
//
// Created by Clement on 12/14/15.
// Copyright 2015 High Fidelity, Inc.
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

2
assignment-client/src/AssignmentClientLogging.h
View file

@ -3,7 +3,7 @@
// assignment-client/src
//
// Created by Clement on 12/14/15.
// Copyright 2015 High Fidelity, Inc.
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

26
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -11,9 +11,13 @@
#include "EntityScriptServer.h"
#include <mutex>
#include <AudioConstants.h>
#include <AudioInjectorManager.h>
#include <ClientServerUtils.h>
#include <EntityScriptingInterface.h>
#include <LogHandler.h>
#include <MessagesClient.h>
#include <plugins/CodecPlugin.h>
#include <plugins/PluginManager.h>
@ -24,13 +28,9 @@
#include <UUID.h>
#include <WebSocketServerClass.h>
#include "ClientServerUtils.h"
#include "EntityScriptServerLogging.h"
#include "../entities/AssignmentParentFinder.h"
#include <LogHandler.h>
#include <mutex>
using Mutex = std::mutex;
using Lock = std::lock_guard<Mutex>;
@ -101,7 +101,7 @@ void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<Rec
auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID));
if (_entityViewer.getTree() && !_shuttingDown) {
qDebug() << "Reloading: " << entityID;
qCDebug(entity_script_server) << "Reloading: " << entityID;
_entitiesScriptEngine->unloadEntityScript(entityID);
checkAndCallPreload(entityID, true);
}
@ -191,12 +191,12 @@ void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<Receiv
if (enable && senderNode->getCanRez()) {
if (it == std::end(_logListeners)) {
_logListeners.insert(senderUUID);
qInfo() << "Node" << senderUUID << "subscribed to log stream";
qCInfo(entity_script_server) << "Node" << senderUUID << "subscribed to log stream";
}
} else {
if (it != std::end(_logListeners)) {
_logListeners.erase(it);
qInfo() << "Node" << senderUUID << "unsubscribed from log stream";
qCInfo(entity_script_server) << "Node" << senderUUID << "unsubscribed from log stream";
}
}
}
@ -226,16 +226,12 @@ void EntityScriptServer::pushLogs() {
if (node && node->getActiveSocket()) {
auto copy = NLPacket::createCopy(*packet);
nodeList->sendPacket(std::move(copy), *node);
} else {
qWarning() << "Node not found";
}
}
auto node = nodeList->nodeWithUUID(*last);
if (node && node->getActiveSocket()) {
nodeList->sendPacket(std::move(packet), *node);
} else {
qWarning() << "Node not found";
}
}
@ -388,7 +384,7 @@ void EntityScriptServer::handleSelectedAudioFormat(QSharedPointer<ReceivedMessag
void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) {
_selectedCodecName = selectedCodecName;
qDebug() << "Selected Codec:" << _selectedCodecName;
qCDebug(entity_script_server) << "Selected Codec:" << _selectedCodecName;
// release any old codec encoder/decoder first...
if (_codec && _encoder) {
@ -402,7 +398,7 @@ void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) {
if (_selectedCodecName == plugin->getName()) {
_codec = plugin;
_encoder = plugin->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
qDebug() << "Selected Codec Plugin:" << _codec.get();
qCDebug(entity_script_server) << "Selected Codec Plugin:" << _codec.get();
break;
}
}
@ -490,7 +486,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const
QString scriptUrl = entity->getServerScripts();
if (!scriptUrl.isEmpty()) {
scriptUrl = ResourceManager::normalizeURL(scriptUrl);
qDebug() << "Loading entity server script" << scriptUrl << "for" << entityID;
qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID;
ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload);
}
}

14
assignment-client/src/scripts/EntityScriptServerLogging.cpp Normal file
View file

@ -0,0 +1,14 @@
//
// EntityScriptServerLogging.cpp
// assignment-client/src/scripts
//
// Created by Clement on 2/2/17.
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "EntityScriptServerLogging.h"
Q_LOGGING_CATEGORY(entity_script_server, "hifi.entity-script-server")

19
assignment-client/src/scripts/EntityScriptServerLogging.h Normal file
View file

@ -0,0 +1,19 @@
//
// EntityScriptServerLogging.h
// assignment-client/src/scripts
//
// Created by Clement on 2/2/17.
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_EntityScriptServerLogging_h
#define hifi_EntityScriptServerLogging_h
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(entity_script_server)
#endif // hifi_EntityScriptServerLogging_h

3
interface/src/EntityScriptServerLogClient.cpp
View file

@ -33,7 +33,6 @@ void EntityScriptServerLogClient::disconnectNotify(const QMetaMethod& signal) {
}
void EntityScriptServerLogClient::connectionsChanged() {
qDebug() << Q_FUNC_INFO << _subscribed << receivers(SIGNAL(receivedNewLogLines(QString)));
auto numReceivers = receivers(SIGNAL(receivedNewLogLines(QString)));
if (!_subscribed && numReceivers > 0) {
enableToEntityServerScriptLog(DependencyManager::get<NodeList>()->getThisNodeCanRez());
@ -58,8 +57,6 @@ void EntityScriptServerLogClient::enableToEntityServerScriptLog(bool enable) {
}
}
_subscribed = enable;
} else {
qWarning() << "Entity Script Server not found";
}
}

2
scripts/developer/debugging/essDebugWindow.js
View file

@ -13,7 +13,7 @@
// Set up the qml ui
var qml = Script.resolvePath('debugWindow.qml');
var window = new OverlayWindow({
title: 'Debug Window',
title: 'Entity Script Server Log Window',
source: qml,
width: 400, height: 900,
});