pool/gvfs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 451988 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/451988
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2017-01-27 09:42:19 +00:00 committed by Git OBS Bridge
commit 5c7a256a0b
3 changed files with 172 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
gvfs-silence-log-spam.patch Normal file
View File

@ -0,0 +1,163 @@
10d109eaa10b34a9516c0c05f774 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 15 Dec 2016 11:18:00 +0100
Subject: network: Do not spam journal by useless warnings
The following warning is always printed from network backend
if smb backend is installed and network backend is mounted:
Couldn't create directory monitor on smb://[WORKGROUP]/.
You can see it with two different error messages. The first is
printed if we are not in samba environment, or the workgroup is
misconfigured:
Error: The specified location is not mounted
The second is printed in other cases, because monitoring is not
supported by smb backend:
Error: Operation not supported by backend
This isn't really useful and just spams the journal, let's use
g_debug instead of g_warning.
---
daemon/gvfsbackendnetwork.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
index fc6cca4..95fee1d 100644
--- a/daemon/gvfsbackendnetwork.c
+++ b/daemon/gvfsbackendnetwork.c
@@ -358,7 +358,7 @@ recompute_files (GVfsBackendNetwork *backend)
else
{
char *uri = g_file_get_uri (server_file);
- g_warning ("Couldn't create directory monitor on %s. Error: %s",
+ g_debug ("Couldn't create directory monitor on %s. Error: %s",
uri, error->message);
g_free (uri);
g_clear_error (&error);
--
cgit v0.12
From 8dec4b1823298e754f6c6408276fe775c82dfa99 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 15 Dec 2016 11:26:26 +0100
Subject: job: Do not spam journal by useless warnings
The following warnings are printed from daemons if an enumeration is
closed by a client prematurely, or a client terminates unexpectidly:
send_infos_cb: No such interface 'org.gtk.vfs.Enumerator' ...
send_done_cb: No such interface 'org.gtk.vfs.Enumerator' ...
send_infos_cb: The connection is closed
send_done_cb: The connection is closed
Those warnings are not really useful and just spam journal. They are
usualy printed as a consequence of some client crashes. This situation
is expected and it is not cricial for daemons. Let's use g_debug
instead of them...
---
daemon/gvfsjobenumerate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c
index bb42a3f..f09785b 100644
--- a/daemon/gvfsjobenumerate.c
+++ b/daemon/gvfsjobenumerate.c
@@ -145,7 +145,7 @@ send_infos_cb (GVfsDBusEnumerator *proxy,
if (error != NULL)
{
g_dbus_error_strip_remote_error (error);
- g_warning ("send_infos_cb: %s (%s, %d)\n", error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("send_infos_cb: %s (%s, %d)\n", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
}
}
@@ -234,7 +234,7 @@ send_done_cb (GVfsDBusEnumerator *proxy,
if (error != NULL)
{
g_dbus_error_strip_remote_error (error);
- g_warning ("send_done_cb: %s (%s, %d)\n", error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("send_done_cb: %s (%s, %d)\n", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
}
}
--
cgit v0.12
From 1d6709036f22cc2a76d2f51314e5987cb2a57dc5 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 15 Dec 2016 11:41:17 +0100
Subject: mount: Do not spam journal by useless warnings
The following warning is printed if mount failed from whatever reason:
dbus_mount_reply: Error from org.gtk.vfs.Mountable.mount(): ...
It is expected that mount may fail for various reasons and it is not
definitely anything critical what needs to be always printed. It
happens regularly with smbbrowse, whenf we are not in smb environment,
or the workgroup is misconfigured. Let's use g_debug instead of g_warning.
---
daemon/mount.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/mount.c b/daemon/mount.c
index e10e145..a3a7991 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -296,7 +296,7 @@ dbus_mount_reply (GVfsDBusMountable *proxy,
else
{
g_dbus_error_strip_remote_error (error);
- g_warning ("dbus_mount_reply: Error from org.gtk.vfs.Mountable.mount(): %s", error->message);
+ g_debug ("dbus_mount_reply: Error from org.gtk.vfs.Mountable.mount(): %s", error->message);
mount_finish (data, error);
g_error_free (error);
}
--
cgit v0.12
From acb3269dd89c87d13c8e238ebb0c136e3824ac86 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 15 Dec 2016 15:12:05 +0100
Subject: Add missing newline characters in g_debug
Unfortunately, g_debug uses custom handler in GVfs which requires
additional new line character. Commit a7b0a65 and commit 1d67090
changed g_warning to g_debug, but forgot to add additional new line
characters.
---
daemon/gvfsbackendnetwork.c | 2 +-
daemon/mount.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
index 95fee1d..c6a103d 100644
--- a/daemon/gvfsbackendnetwork.c
+++ b/daemon/gvfsbackendnetwork.c
@@ -358,7 +358,7 @@ recompute_files (GVfsBackendNetwork *backend)
else
{
char *uri = g_file_get_uri (server_file);
- g_debug ("Couldn't create directory monitor on %s. Error: %s",
+ g_debug ("Couldn't create directory monitor on %s. Error: %s\n",
uri, error->message);
g_free (uri);
g_clear_error (&error);
diff --git a/daemon/mount.c b/daemon/mount.c
index a3a7991..2e2f74b 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -296,7 +296,7 @@ dbus_mount_reply (GVfsDBusMountable *proxy,
else
{
g_dbus_error_strip_remote_error (error);
- g_debug ("dbus_mount_reply: Error from org.gtk.vfs.Mountable.mount(): %s", error->message);
+ g_debug ("dbus_mount_reply: Error from org.gtk.vfs.Mountable.mount(): %s\n", error->message);
mount_finish (data, error);
g_error_free (error);
}
--
cgit v0.12

6
gvfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 19 21:00:59 UTC 2017 - zaitor@opensuse.org
- Add gvfs-silence-log-spam.patch: Remove some logspam from
journald logs, patch from upstream git.
-------------------------------------------------------------------
Fri Dec 16 13:11:20 UTC 2016 - zaitor@opensuse.org

3
gvfs.spec
View File

@ -36,6 +36,8 @@ Patch6: gvfs-nds.patch
# needed for patches 5 and 6
BuildRequires: autoconf
%endif
# PATCH-FIX-UPSTREAM gvfs-silence-log-spam.patch zaitor@opensuse.org -- Remove som logspam from journald logs.
Patch7: gvfs-silence-log-spam.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fuse-devel
BuildRequires: intltool
@ -161,6 +163,7 @@ translation-update-upstream
%patch5 -p1
%patch6 -p1
%endif
%patch7 -p1
%build
%if !0%{?is_opensuse}