Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Linnea Samila
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 136ad0f2
authored
Jul 29, 2016
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some minor logging stuff
1 parent
42ac6905
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/moyamessage/MoyaEventSender.java
code/moya-web/src/main/java/fi/codecrew/moya/HostnameFilter.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
View file @
136ad0f
...
@@ -387,7 +387,9 @@ public class PlaceBean implements PlaceBeanLocal {
...
@@ -387,7 +387,9 @@ public class PlaceBean implements PlaceBeanLocal {
userfacade
.
flush
();
userfacade
.
flush
();
boolean
associatedToPlace
=
isUserMember
(
user
,
places
.
get
(
0
).
getProduct
());
boolean
associatedToPlace
=
isUserMember
(
user
,
places
.
get
(
0
).
getProduct
());
StringBuilder
logSb
=
new
StringBuilder
();
logSb
.
append
(
"User Locked "
).
append
(
places
.
size
()).
append
(
" places: "
);
for
(
Place
p
:
places
)
{
for
(
Place
p
:
places
)
{
if
(!
p
.
isReservedFor
(
user
))
{
if
(!
p
.
isReservedFor
(
user
))
{
...
@@ -397,6 +399,8 @@ public class PlaceBean implements PlaceBeanLocal {
...
@@ -397,6 +399,8 @@ public class PlaceBean implements PlaceBeanLocal {
}
}
}
}
logger
.
info
(
"Buying place {} for user {}"
,
p
.
getName
(),
user
.
getUser
().
getLogin
());
logger
.
info
(
"Buying place {} for user {}"
,
p
.
getName
(),
user
.
getUser
().
getLogin
());
logSb
.
append
(
p
.
getName
()).
append
(
" "
);
GroupMembership
gm
=
buy
(
p
,
pg
);
GroupMembership
gm
=
buy
(
p
,
pg
);
if
(!
associatedToPlace
)
if
(!
associatedToPlace
)
{
{
...
@@ -410,6 +414,7 @@ public class PlaceBean implements PlaceBeanLocal {
...
@@ -410,6 +414,7 @@ public class PlaceBean implements PlaceBeanLocal {
}
}
}
}
loggerbean
.
sendMessage
(
MoyaEventType
.
PLACE_ACTION
,
permbean
.
getCurrentUser
(),
logSb
.
toString
());
// adding account event does funny stuff. evicting helps...
// adding account event does funny stuff. evicting helps...
userfacade
.
evict
();
userfacade
.
evict
();
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java
View file @
136ad0f
...
@@ -641,7 +641,7 @@ public class UserBean implements UserBeanLocal {
...
@@ -641,7 +641,7 @@ public class UserBean implements UserBeanLocal {
if
(
eu
==
null
)
if
(
eu
==
null
)
return
null
;
return
null
;
loggerbean
.
sendMessage
(
MoyaEventType
.
INVITE_ACCEPTED
,
eu
,
"I
vite accepted by current user"
,
gm
,
gm
.
getUser
());
loggerbean
.
sendMessage
(
MoyaEventType
.
INVITE_ACCEPTED
,
eu
,
"I
nvite accepted by current user "
,
gm
,
gm
.
getUser
());
gm
.
setUser
(
eu
);
gm
.
setUser
(
eu
);
gm
.
setInviteAccepted
(
Calendar
.
getInstance
());
gm
.
setInviteAccepted
(
Calendar
.
getInstance
());
...
...
code/moya-beans/ejbModule/fi/codecrew/moya/beans/moyamessage/MoyaEventSender.java
View file @
136ad0f
...
@@ -67,7 +67,7 @@ public class MoyaEventSender implements LoggingBeanLocal {
...
@@ -67,7 +67,7 @@ public class MoyaEventSender implements LoggingBeanLocal {
msg
.
setCurrentUserId
(
permbean
.
getCurrentUser
().
getUser
().
getId
());
msg
.
setCurrentUserId
(
permbean
.
getCurrentUser
().
getUser
().
getId
());
msg
.
setEventId
(
eventbean
.
getCurrentEvent
().
getId
());
msg
.
setEventId
(
eventbean
.
getCurrentEvent
().
getId
());
msg
.
setDescription
(
message
);
msg
.
setDescription
(
message
);
logger
.
info
(
"Sending Moya message {} with description "
,
type
,
message
);
logger
.
debug
(
"Sending Moya message {} with description "
,
type
,
message
);
sendMessage
(
msg
);
sendMessage
(
msg
);
}
}
...
@@ -76,6 +76,7 @@ public class MoyaEventSender implements LoggingBeanLocal {
...
@@ -76,6 +76,7 @@ public class MoyaEventSender implements LoggingBeanLocal {
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
for
(
Object
m
:
message
)
{
for
(
Object
m
:
message
)
{
sb
.
append
(
m
);
sb
.
append
(
m
);
sb
.
append
(
" "
);
}
}
sendMessage
(
type
,
user
,
sb
.
toString
());
sendMessage
(
type
,
user
,
sb
.
toString
());
...
@@ -83,9 +84,11 @@ public class MoyaEventSender implements LoggingBeanLocal {
...
@@ -83,9 +84,11 @@ public class MoyaEventSender implements LoggingBeanLocal {
@Override
@Override
public
void
sendMessage
(
MoyaEventType
type
,
Object
...
message
)
{
public
void
sendMessage
(
MoyaEventType
type
,
Object
...
message
)
{
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
for
(
Object
m
:
message
)
{
for
(
Object
m
:
message
)
{
sb
.
append
(
m
);
sb
.
append
(
m
);
sb
.
append
(
" "
);
}
}
sendMessage
(
type
,
permbean
.
getCurrentUser
(),
sb
.
toString
());
sendMessage
(
type
,
permbean
.
getCurrentUser
(),
sb
.
toString
());
...
...
code/moya-web/src/main/java/fi/codecrew/moya/HostnameFilter.java
View file @
136ad0f
...
@@ -247,7 +247,7 @@ public class HostnameFilter implements Filter {
...
@@ -247,7 +247,7 @@ public class HostnameFilter implements Filter {
httpRequest
.
login
(
null
,
restAuthStr
);
httpRequest
.
login
(
null
,
restAuthStr
);
}
catch
(
ServletException
loginEx
)
{
}
catch
(
ServletException
loginEx
)
{
ret
=
false
;
ret
=
false
;
logger
.
info
(
"Rest api authentication failed
! "
,
loginEx
);
logger
.
info
(
"Rest api authentication failed
for path "
+
httpRequest
.
getPathInfo
()
+
" "
+
httpRequest
.
getParameterMap
().
toString
()
,
loginEx
);
if
(
response
instanceof
HttpServletResponse
)
{
if
(
response
instanceof
HttpServletResponse
)
{
HttpServletResponse
httpResp
=
((
HttpServletResponse
)
response
);
HttpServletResponse
httpResp
=
((
HttpServletResponse
)
response
);
httpResp
.
setStatus
(
HttpServletResponse
.
SC_FORBIDDEN
);
httpResp
.
setStatus
(
HttpServletResponse
.
SC_FORBIDDEN
);
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment