raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into fix-receive-timeout

Browse source
This commit is contained in:
Roman Niukhalov 2018-07-16 14:17:02 +07:00 • committed by GitHub
commit 4ffe9e3ad8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-docs/src/main/paradox/distributed-data.md
View file

@ -774,11 +774,9 @@ data entries, because then the remote message size will be too large.
## Learn More about CRDTs
* [The Final Causal Frontier](http://www.ustream.tv/recorded/61448875)
talk by Sean Cribbs
* [Eventually Consistent Data Structures](https://vimeo.com/43903960)
talk by Sean Cribbs
* [Strong Eventual Consistency and Conflict-free Replicated Data Types](http://research.microsoft.com/apps/video/default.aspx?id=153540&r=1)
* [Strong Eventual Consistency and Conflict-free Replicated Data Types (video)](https://www.youtube.com/watch?v=oyUHd894w18&feature=youtu.be)
talk by Mark Shapiro
* [A comprehensive study of Convergent and Commutative Replicated Data Types](http://hal.upmc.fr/file/index/docid/555588/filename/techreport.pdf)
paper by Mark Shapiro et. al.

40
akka-stream/src/main/scala/akka/stream/Attributes.scala
View file

@ -348,20 +348,25 @@ object Attributes {
* Java API
*
* Configures `log()` operator log-levels to be used when logging.
* Logging a certain operation can be completely disabled by using [[LogLevels.Off]].
* Logging a certain operation can be completely disabled by using [[Attributes#logLevelOff]].
*
* Passing in null as any of the arguments sets the level to its default value, which is:
* `Debug` for `onElement` and `onFinish`, and `Error` for `onFailure`.
*/
def createLogLevels(onElement: Logging.LogLevel, onFinish: Logging.LogLevel, onFailure: Logging.LogLevel): Attributes =
logLevels(
onElement = Option(onElement).getOrElse(Logging.DebugLevel),
onFinish = Option(onFinish).getOrElse(Logging.DebugLevel),
onFailure = Option(onFailure).getOrElse(Logging.ErrorLevel))
logLevels(onElement, onFinish, onFailure)
/**
* Java API
*
* Configures `log()` operator log-levels to be used when logging onElement.
* Logging a certain operation can be completely disabled by using [[Attributes#logLevelOff]].
*
*/
def createLogLevels(onElement: Logging.LogLevel): Attributes =
logLevels(onElement)
/**
* Configures `log()` operator log-levels to be used when logging.
* Logging a certain operation can be completely disabled by using [[Attributes#logLevelOff]].
* Logging a certain operation can be completely disabled by using [[LogLevels.Off]].
*
* See [[Attributes.createLogLevels]] for Java API
*/
@ -440,16 +445,21 @@ object ActorAttributes {
* Java API
*
* Configures `log()` operator log-levels to be used when logging.
* Logging a certain operation can be completely disabled by using [[LogLevels.Off]].
* Logging a certain operation can be completely disabled by using [[Attributes#logLevelOff]].
*
* Passing in null as any of the arguments sets the level to its default value, which is:
* `Debug` for `onElement` and `onFinish`, and `Error` for `onFailure`.
*/
def createLogLevels(onElement: Logging.LogLevel, onFinish: Logging.LogLevel, onFailure: Logging.LogLevel): Attributes =
logLevels(
onElement = Option(onElement).getOrElse(Logging.DebugLevel),
onFinish = Option(onFinish).getOrElse(Logging.DebugLevel),
onFailure = Option(onFailure).getOrElse(Logging.ErrorLevel))
logLevels(onElement, onFinish, onFailure)
/**
* Java API
*
* Configures `log()` operator log-levels to be used when logging onElement.
* Logging a certain operation can be completely disabled by using [[Attributes#logLevelOff]].
*
*/
def createLogLevels(onElement: Logging.LogLevel): Attributes =
logLevels(onElement)
/**
* Configures `log()` operator log-levels to be used when logging.