[X2Go-Commits] [x2goclient] 144/219: src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
git-admin at x2go.org
git-admin at x2go.org
Thu Sep 22 04:37:01 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 8f3cd1821551341bf61f58eacce06962c4e52211
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Apr 27 01:39:02 2016 +0200
src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
---
debian/changelog | 1 +
src/pulsemanager.cpp | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 070b5ab..cfeea71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -245,6 +245,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
(OS-dependent) PulseAudio config and cookie directory.
- src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones
depending on the detected PA version.
+ - src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
-- X2Go Release Manager <git-admin at x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9f57525..03e321f 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -159,7 +159,9 @@ void PulseManager::start_osx () {
+ "/modules").absolutePath ()
<< "--high-priority";
#ifdef DEBUG
- server_args_ << "--log-level=debug";
+ server_args_ << "--log-level=debug"
+ << "--verbose"
+ << "--log-target=file:" pulse_dir_.absolutePath () + "/pulse.log";
#endif // defined (DEBUG)
if (generate_server_config () && generate_client_config ()) {
@@ -180,7 +182,10 @@ void PulseManager::start_win () {
+ QString::number (pulse_version_minor_)
+ "/modules/").absolutePath ());
#ifdef DEBUG
- server_args_ << "--log-level=debug";
+ /* FIXME: need a way to request debugging. */
+ server_args_ << "--log-level=debug"
+ << "--verbose"
+ << "--log-target=file:" + pulse_dir_.absolutePath () + "\\pulse.log";
#endif // defined (DEBUG)
if (generate_server_config () && generate_client_config ()) {
@@ -535,6 +540,8 @@ void PulseManager::on_pulse_finished (int exit_code) {
// Remove server config file, otherwise the directory won't be empty.
work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ "/config.pa").absolutePath ()));
+ work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ + "/pulse.log").absolutePath ()));
#else // Linux
// FIXME.
#endif
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list