Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c88dc879
Commit
c88dc879
authored
Jul 02, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Single log file
parent
a8030c39
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
16 deletions
+2
-16
log_monitor.c
native/jni/core/log_monitor.c
+2
-15
magisk.h
native/jni/include/magisk.h
+0
-1
No files found.
native/jni/core/log_monitor.c
View file @
c88dc879
...
...
@@ -22,8 +22,7 @@ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
enum
{
HIDE_EVENT
,
LOG_EVENT
,
DEBUG_EVENT
LOG_EVENT
};
struct
log_listener
{
...
...
@@ -36,12 +35,7 @@ static int am_proc_start_filter(const char *log) {
}
static
int
magisk_log_filter
(
const
char
*
log
)
{
char
*
ss
;
return
(
ss
=
strstr
(
log
,
" Magisk"
))
&&
(
ss
[
-
1
]
!=
'D'
)
&&
(
ss
[
-
1
]
!=
'V'
);
}
static
int
magisk_debug_log_filter
(
const
char
*
log
)
{
return
strstr
(
log
,
"am_proc_start"
)
==
NULL
;
return
!
am_proc_start_filter
(
log
);
}
static
struct
log_listener
log_events
[]
=
{
...
...
@@ -52,10 +46,6 @@ static struct log_listener log_events[] = {
{
/* LOG_EVENT */
.
fd
=
-
1
,
.
filter
=
magisk_log_filter
},
{
/* DEBUG_EVENT */
.
fd
=
-
1
,
.
filter
=
magisk_debug_log_filter
}
};
#define EVENT_NUM (sizeof(log_events) / sizeof(struct log_listener))
...
...
@@ -114,9 +104,6 @@ void log_daemon() {
// Setup log dumps
rename
(
LOGFILE
,
LOGFILE
".bak"
);
log_events
[
LOG_EVENT
].
fd
=
xopen
(
LOGFILE
,
O_CREAT
|
O_WRONLY
|
O_TRUNC
|
O_CLOEXEC
,
0644
);
#ifdef MAGISK_DEBUG
log_events
[
DEBUG_EVENT
].
fd
=
xopen
(
DEBUG_LOG
,
O_CREAT
|
O_WRONLY
|
O_TRUNC
|
O_CLOEXEC
,
0644
);
#endif
int
log_fd
=
-
1
,
log_pid
;
char
line
[
PIPE_BUF
];
...
...
native/jni/include/magisk.h
View file @
c88dc879
...
...
@@ -30,7 +30,6 @@
#define DATABIN SECURE_DIR "/magisk"
#define MAGISKDB SECURE_DIR "/magisk.db"
#define SIMPLEMOUNT SECURE_DIR "/magisk_simple"
#define DEBUG_LOG SECURE_DIR "/magisk_debug.log"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MAGISKRC "/init.magisk.rc"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment