Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
06717370
Commit
06717370
authored
Jul 11, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provide a traceback when `waitUntil` times out
parent
a1630b5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
src/headless/converse-core.js
src/headless/converse-core.js
+5
-13
src/headless/utils/core.js
src/headless/utils/core.js
+10
-2
No files found.
src/headless/converse-core.js
View file @
06717370
...
...
@@ -260,25 +260,17 @@ _converse.log = function (message, level, style='') {
message
=
message
.
outerHTML
;
}
const
prefix
=
style
?
'
%c
'
:
''
;
const
logger
=
Object
.
assign
({
'
debug
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
error
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
info
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
warn
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
},
console
);
if
(
level
===
Strophe
.
LogLevel
.
ERROR
)
{
logger
.
error
(
`
${
prefix
}
ERROR:
${
message
}
`
,
style
);
u
.
logger
.
error
(
`
${
prefix
}
ERROR:
${
message
}
`
,
style
);
}
else
if
(
level
===
Strophe
.
LogLevel
.
WARN
)
{
if
(
_converse
.
debug
)
{
logger
.
warn
(
`
${
prefix
}
${(
new
Date
()).
toISOString
()}
WARNING:
${
message
}
`
,
style
);
}
u
.
logger
.
warn
(
`
${
prefix
}
${(
new
Date
()).
toISOString
()}
WARNING:
${
message
}
`
,
style
);
}
else
if
(
level
===
Strophe
.
LogLevel
.
FATAL
)
{
logger
.
error
(
`
${
prefix
}
FATAL:
${
message
}
`
,
style
);
u
.
logger
.
error
(
`
${
prefix
}
FATAL:
${
message
}
`
,
style
);
}
else
if
(
_converse
.
debug
)
{
if
(
level
===
Strophe
.
LogLevel
.
DEBUG
)
{
logger
.
debug
(
`
${
prefix
}
${(
new
Date
()).
toISOString
()}
DEBUG:
${
message
}
`
,
style
);
u
.
logger
.
debug
(
`
${
prefix
}
${(
new
Date
()).
toISOString
()}
DEBUG:
${
message
}
`
,
style
);
}
else
{
logger
.
info
(
`
${
prefix
}
${(
new
Date
()).
toISOString
()}
INFO:
${
message
}
`
,
style
);
u
.
logger
.
info
(
`
${
prefix
}
${(
new
Date
()).
toISOString
()}
INFO:
${
message
}
`
,
style
);
}
}
};
...
...
src/headless/utils/core.js
View file @
06717370
...
...
@@ -14,13 +14,19 @@ import sizzle from "sizzle";
const
Strophe
=
strophe
.
default
.
Strophe
;
/**
* The utils object
* @namespace u
*/
const
u
=
{};
u
.
logger
=
Object
.
assign
({
'
debug
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
error
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
info
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
warn
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
},
console
);
u
.
isTagEqual
=
function
(
stanza
,
name
)
{
if
(
stanza
.
nodeTree
)
{
return
u
.
isTagEqual
(
stanza
.
nodeTree
,
name
);
...
...
@@ -554,7 +560,9 @@ u.waitUntil = function (func, max_wait=300, check_delay=3) {
const
interval
=
setInterval
(
checker
,
check_delay
);
const
max_wait_timeout
=
setTimeout
(()
=>
{
clearTimers
(
max_wait_timeout
,
interval
);
promise
.
reject
(
new
Error
(
'
Wait until promise timed out
'
));
const
err_msg
=
'
Wait until promise timed out
'
;
u
.
logger
.
error
(
err_msg
);
promise
.
reject
(
new
Error
(
err_msg
));
},
max_wait
);
return
promise
;
...
...
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